diff --git a/gitnotes b/gitnotes new file mode 100644 index 0000000..9ed5750 --- /dev/null +++ b/gitnotes @@ -0,0 +1,3 @@ +merge of feature branch with master +git checkout master +git merge --no-ff FeatureBranch