svn commit: r1632574 - /tomee/site/trunk/content/dev/git.mdtext

[an...@apache.org]

Author: andygumbrecht
Date: Fri Oct 17 13:43:09 2014
New Revision: 1632574

URL: http://svn.apache.org/r1632574
Log:
Commands

Modified:
    tomee/site/trunk/content/dev/git.mdtext

Modified: tomee/site/trunk/content/dev/git.mdtext
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/dev/git.mdtext?rev=1632574&r1=1632573&r2=1632574&view=diff
==============================================================================
--- tomee/site/trunk/content/dev/git.mdtext (original)
+++ tomee/site/trunk/content/dev/git.mdtext Fri Oct 17 13:43:09 2014
@@ -1,5 +1,7 @@
 Title: GIT for TomEE Developers
 
+###The GitFlow Workflow
+
 Notes before you begin (mostly for SVN users):
 
 * The '*develop*' repository is the equivalent of the SVN *trunk* directory.  
@@ -33,30 +35,29 @@ Once that is done then you just need the
 
 ><span style="color: rgb(51,51,153);">git push</span>
 
-<span style="color: rgb(0,128,0);">Work like mad on the JIRA issue and commit as often as you like...</span>
-
-><span style="color: rgb(51,51,153);">git commit</span>
-><span style="color: rgb(51,51,153);">git push</span>
+<span style="color: rgb(0,128,0);">Work like mad on the JIRA issue calling commit and add as often as you like...</span>
 
-If others are working on your branch also remember to pull their changes (Or as good practice):
+If others are working on your branch also remember to pull their changes (Or just as good practice):
 
 ><span style="color: rgb(51,51,153);">git pull</span>
+>
+><span style="color: rgb(51,51,153);">git commit</span>
+>
+><span style="color: rgb(51,51,153);">git push</span>
 
 Finally, to push the completed (or significant non-breaking progress on the) feature to *develop* at any time (ensuring *develop* is up to date first):
 
-><span style="color: rgb(51,51,153);">git commit</span>
+><span style="color: rgb(51,51,153);">git pull origin develop</span>
 
 ><span style="color: rgb(51,51,153);">git checkout develop</span>
 
-><span style="color: rgb(51,51,153);">git pull</span>
-
-><span style="color: rgb(51,51,153);">git pull origin TOMEE-007</span>
+><span style="color: rgb(51,51,153);">git merge --no-ff TOMEE-007</span>
 
-><span style="color: rgb(51,51,153);">git push</span>
+Once the completed feature is merged and the JIRA resolved then the branch can and 'should' be deleted before pushing:
 
-Once the completed feature is pushed and the JIRA resolved then the branch can and 'should' be deleted:
+><span style="color: rgb(51,51,153);">git branch -d TOMEE-007</span>
 
-><span style="color: rgb(51,51,153);">git push origin --delete TOMEE-007</span>
+><span style="color: rgb(51,51,153);">git push origin develop</span>
 
 <a name="git-gui"></a>
 ###The GUI Way