Added notes about how to handle feature branches and merging of these.

13 years ago · 0305426b63
parent 4d613ac5b4
commit 0305426b63
1 changed files with 3 additions and 0 deletions
--- a/3
+++ b/3
@ -0,0 +1,3 @@
+merge of feature branch with master
+git checkout master
+git merge --no-ff FeatureBranch