Changes between Version 1 and Version 2 of DeveloperGuidelines/Git

Timestamp:

12/20/11 17:46:21 (13 years ago)

Author:

Fran Boon

Comment:

--

DeveloperGuidelines/Git

@@ -25 +25 @@
 {{{
 cd <mybranch>
-
+# Update your working directory with latest code from Trunk
+git checkout master
+git pull
+git checkout -b <mystory>
+git commit -am "My Story"
+# Quick review of code (no test code left in, etc)
+git diff master
+# Merge latest Trunk
+git checkout master
+git pull
+git checkout <mystory>
+git rebase master
+# Push to your branch on GitHub
+git checkout master
+git merge <mystory>
+git push
+# Cleanup
+git branch -d <mystory>
 }}}
 === Developer Configuration ===