Changes between Version 30 and Version 31 of DeveloperGuidelines/Git


Ignore:
Timestamp:
02/02/12 02:12:18 (10 years ago)
Author:
Michael Howden
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v30 v31  
    4848>>>>>>> "My Story"
    4949}}}
    50 You can correct these conflict in your code text editor, then continue the rebase:
     50You can correct these conflict in your code text editor, then add them andcontinue the rebase:
    5151{{{
     52git add -u
    5253git rebase --continue
    5354}}}