Changes between Version 52 and Version 53 of DeveloperGuidelines/Git


Ignore:
Timestamp:
05/18/12 05:55:41 (13 years ago)
Author:
Fran Boon
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • DeveloperGuidelines/Git

    v52 v53  
    6767
    6868[[Image(https://docs.google.com/drawings/pub?id=1QmGeuQvFpg3pDQpM9xu81V7MlVy4uU8EzVIRqQ14MwU&w=792&h=353)]]
     69[[BR]]
    6970https://docs.google.com/drawings/d/1QmGeuQvFpg3pDQpM9xu81V7MlVy4uU8EzVIRqQ14MwU/edit
    70 
    71 If you want to adopt the [http://blog.hasmanythrough.com/2008/12/18/agile-git-and-the-story-branch-pattern Story Branch] pattern, which allows pushing interim work to GitHub for review & also allowing contributing quick fixes to Trunk without needing to complete the interim work:
    72 {{{
    73 git checkout -b <mystory>
    74 
    75 git commit -a
    76 ...
    77 git commit -a
    78 
    79 # Quick review of code (no test code left in, etc)
    80 git diff master...HEAD
    81 }}}
    82 
    8371==== Resolving Merge Conflicts ====
    8472If you encounter conflicts during the rebase, the conflicts will be tagged in the files with: