Changes between Version 54 and Version 55 of DeveloperGuidelines/Git


Ignore:
Timestamp:
05/18/12 05:57:30 (9 years ago)
Author:
Fran Boon
Comment:

Story Branches to separate section

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v54 v55  
    177177If you have made changes to one branch & wish to backport them to another branch, then this is done most easily using a Patch:
    178178* http://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git
     179
     180=== Story Branches ===
     181The [http://blog.hasmanythrough.com/2008/12/18/agile-git-and-the-story-branch-pattern Story Branch] pattern allows pushing interim work to GitHub for review & also allowing contributing quick fixes to Trunk without needing to complete the interim work:
     182{{{
     183git checkout -b <mystory>
     184
     185git commit -a
     186...
     187git commit -a
     188
     189# Quick review of code (no test code left in, etc)
     190git diff master...HEAD
     191}}}
     192https://docs.google.com/drawings/d/1Vhvm1EmqWOVNZkZsiJ0MLLpdTl6H_ya263Tdb2HK1N0/edit
    179193== Developer Configuration ==
    180194{{{