Changes between Version 54 and Version 55 of DeveloperGuidelines/Git

Timestamp:

05/18/12 05:57:30 (13 years ago)

Author:

Fran Boon

Comment:

Story Branches to separate section

DeveloperGuidelines/Git

@@ -177 +177 @@
 If you have made changes to one branch & wish to backport them to another branch, then this is done most easily using a Patch:
 * http://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git
+
+=== Story Branches ===
+The [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:
+{{{
+git checkout -b <mystory>
+
+git commit -a
+...
+git commit -a
+
+# Quick review of code (no test code left in, etc)
+git diff master...HEAD
+}}}
+https://docs.google.com/drawings/d/1Vhvm1EmqWOVNZkZsiJ0MLLpdTl6H_ya263Tdb2HK1N0/edit
 == Developer Configuration ==
 {{{