Changes between Version 29 and Version 30 of DeveloperGuidelines/Git


Ignore:
Timestamp:
02/02/12 01:59:14 (10 years ago)
Author:
Michael Howden
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v29 v30  
    3030git pull
    3131git checkout <mystory>
    32 git rebase master
     32git 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.
    3333# Push to your branch on GitHub
    3434git checkout master
     
    4040
    4141=== Resolving Merge Conflicts ===
     42If you encounter conflicts during the rebase, the conflicts will be tagged in the files with:
     43{{{
     44<<<<<<< HEAD
     45# Commits from Trunk
     46=======
     47# Commits from <mystory>
     48>>>>>>> "My Story"
     49}}}
     50You can correct these conflict in your code text editor, then continue the rebase:
     51{{{
     52git rebase --continue
     53}}}
     54
    4255You can create the .THIS & .OTHER files using:
    4356{{{