Changes between Version 1 and Version 2 of DeveloperGuidelines/Git


Ignore:
Timestamp:
12/20/11 17:46:21 (10 years ago)
Author:
Fran Boon
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v1 v2  
    2525{{{
    2626cd <mybranch>
    27 
     27# Update your working directory with latest code from Trunk
     28git checkout master
     29git pull
     30git checkout -b <mystory>
     31git commit -am "My Story"
     32# Quick review of code (no test code left in, etc)
     33git diff master
     34# Merge latest Trunk
     35git checkout master
     36git pull
     37git checkout <mystory>
     38git rebase master
     39# Push to your branch on GitHub
     40git checkout master
     41git merge <mystory>
     42git push
     43# Cleanup
     44git branch -d <mystory>
    2845}}}
    2946=== Developer Configuration ===