Drupal Enterprise: Update Your Site Code and settings.php File
The OIT Drupal support team periodically releases updates to the default files of the University's Drupal platform. Site administrators will need to update their default site code to match. You can do this by updating each file separately, or if you have previously forked the default site code, by updating your whole forked repository. There are multiple ways to update a single file; we have outlined the easiest method we have found below.
If you made changes to your forked repository you might see conflicts when you try to commit. You need to resolve all conflicts before you will be able to commit. Follow the instructions for Resolving Merge Conflicts.