Changes

Jump to navigation Jump to search
294 bytes added ,  19:13, 18 July 2015
no edit summary
Line 8: Line 8:     
== Branching ==
 
== Branching ==
  git checkout <branch_name>
+
  git checkout -b <branch_name>
 
  git merge
 
  git merge
 +
 +
=== git Successful Feature Branching Workflow ===
 +
Onece you have cloned the master repository:
 +
* Create a branch for each feature
 +
* Merge branches with --no-ff
 +
 +
git checkout -b <branch_name>
 +
Write your new code
 +
Switch to the master branch to merge
 +
git merge --no-ff <brach_to_merge_name>
    
== Undo last changes ==
 
== Undo last changes ==

Navigation menu