Differences

This shows you the differences between two versions of the page.

--- docs:drupal:upgrading_using_git [2014/02/03 12:55] – created billh
+++ docs:drupal:upgrading_using_git [2016/08/05 15:59] (current) – billh
@@ Line 2: / Line 2: @@
 <note>These instructions are specific to when you have a live site, a development machine, and both are set up for git push/pull</note>
+===== running update.php =====
+Several places below reference running update.php.  This means going to your yoursite.com/update.php after logging in as an administrator.  If you are unable to log in, you can force access to update.php by editing the settings.php file in drupal/sites/yoursite/settings.php and set the following line to true (don't forget to change it back after updates are complete)<code>
+$update_free_access = FALSE;
+change to:
+$update_free_access = TRUE;
+</code>
 ===== Initial prep on dev machine =====
@@ Line 12: / Line 21: @@
   * follow [[#Initial prep on dev machine]] above
   * log into the administration pages on your dev machine so your session is set up
+  * get the most recent changes from drupal core<code>
+git fetch drupal
+</code>
   * on a clean master branch (master should be your version of the core, including any changes you had to make for this site, such as .htaccess file changes), determine which version of drupal you want to upgrade to, then merge the appropriate commit, typically by entering the tag which should match the version<code bash>
 git merge 7.26