Changes between Version 87 and Version 88 of DeveloperGuidelines/Git

Timestamp:

01/02/14 15:17:28 (11 years ago)

Author:

Pat Tressel

Comment:

--

DeveloperGuidelines/Git

@@ -127 +127 @@
 Regardless of whether you rebase or merge, neither of these is a "safe" operation -- you may make a mistake
 during the process, or encounter errors or conflicts.  So before starting, a simple way to be sure you can
-go back to your unmodified branch is to make a copy of the branch.  This assumes you are working on branch
-mychanges and want to save your work on branch mychanges_backup, and that you have a remote called upstream
-that points to the trunk repository:
+go back to your unmodified branch is to make a copy of the branch.
+
+The following summary of commands assumes you are working on branch mychanges and want to save your work on
+branch mychanges_backup.  It also assumes you have a master branch that mirrors branch master in trunk, and
+that you have a remote called upstream that points to the trunk repository.  This setup makes it less
+convenient to use the {{{git pull --rebase}}} command, as that (now) requires that the remote and local
+branch have the same name.  Here we show an alternative that does a pull into your local master branch, then
+a rebase from your updated master branch into your mychanges branch.
 
 {{{
 # Check whether you have uncommitted changes
-git log
+git status
 
 # Commit any new and changed files
@@ -142 +147 @@
 git checkout -b mychanges_backup
 
+# Update your master branch (this is assumed to have only trunk commits on it)
+git checkout master
+git pull upstream master
+
 # Switch back to the branch you want to update
 git checkout mychanges
 
-# Update your branch from trunk
-git pull --rebase upstream master:mychanges
+# Update your mychanges branch from your (updated) local master
+git rebase master
+
+# If you get a conflict on one of your commits, the rebase will stop and leave files with the
+# conflicts marked.  See the following section about how to resolve it.  After you have edited
+# any files that need to be changed, git add them and optionally commit them, then continue the
+# rebase.
+# Edit as per next section...
+git add ...
+git rebase --continue
+
+# If, at any point before the end of the rebase, something goes wrong, or you're just not sure
+# what you're doing:
+git rebase --abort
+
 ==== Resolving Merge Conflicts ====
 If you encounter conflicts during the rebase, the conflicts will be tagged in the files with: