

This process lets you manually resolve the conflict using the command line and a text editor. The update warning should disappear after a successful update. Re-upload the corresponding files from GitHub.Īpply one-click core updates via the dashboard with the auto-resolve conflicts option selected. Learn more about this command by running terminus help upstream:updates:apply.
#Pantheon update drupal core code
Run the code below, replacing site and env with your site name and the correct environment. Open Terminus and navigate to your site directory. You can apply updates with Terminus if you prefer using the command line. Refer to Resolve Git Merge Conflicts for more information. This can happen when files are removed or renamed. Some merge conflicts can't be resolved automatically.

This does not solve all problems that may arise, but it should take care of most situations. Pantheon will try to automatically resolve conflicts in favor of the upstream Git repository. Try the "Auto-Resolve" option when applying updates. You may see an error indicating a conflict with some files in core if the update fails. Refer to Resolve Git Merge Conflicts for more information.Ĭlick Visit Development Site in the Dev environment to test and QA the site.įollow the standard Pantheon Workflow to deploy changes up to the Test and Live environments. Drupal users can opt to run update.php after updates are applied: Select whether or not you want to automatically resolve conflicts in the Update Options menu. You can't apply upstream updates when the Connection Mode is set to SFTP.Navigate to the Code tab in the Site Dashboard on the Dev environment, then click Apply Updates.Ĭommit and deploy any SFTP changes, then set the site's Connection Mode to Git.

For additional details, see Scope of Support.Īpply Upstream Updates via the Site Dashboard Do not update core using the WordPress Dashboard, Drush, or WP-CLI you will overwrite your core.
