Changes between Version 30 and Version 31 of DeveloperGuidelines/Git

Timestamp:

02/02/12 02:12:18 (13 years ago)

Author:

Michael Howden

Comment:

--

DeveloperGuidelines/Git

@@ -48 +48 @@
 >>>>>>> "My Story"
 }}}
-You can correct these conflict in your code text editor, then continue the rebase:
+You can correct these conflict in your code text editor, then add them andcontinue the rebase:
 {{{
+git add -u
 git rebase --continue
 }}}