Changes between Version 29 and Version 30 of DeveloperGuidelines/Git

Timestamp:

02/02/12 01:59:14 (13 years ago)

Author:

Michael Howden

Comment:

--

DeveloperGuidelines/Git

@@ -30 +30 @@
 git pull
 git checkout <mystory>
-git rebase master
+git rebase master #The rebase command will apply your commits ON TOP of the latest revisions from trunk, so that they are committed in the right order.
 # Push to your branch on GitHub
 git checkout master
@@ -40 +40 @@
 
 === Resolving Merge Conflicts ===
+If you encounter conflicts during the rebase, the conflicts will be tagged in the files with:
+{{{
+<<<<<<< HEAD
+# Commits from Trunk
+=======
+# Commits from <mystory>
+>>>>>>> "My Story"
+}}}
+You can correct these conflict in your code text editor, then continue the rebase:
+{{{
+git rebase --continue
+}}}
+
 You can create the .THIS & .OTHER files using:
 {{{