Browse Source

Update git merge notes.

Steve Thielemann 4 years ago
parent
commit
bae1290bc1
1 changed files with 6 additions and 0 deletions
  1. 6 0
      README.md

+ 6 - 0
README.md

@@ -58,3 +58,9 @@ If you recall using git push -u when you first setup the git repo.  Well, it's t
 
 This would pull files from bugz-ansi branch into the master branch.
 
+## Merging back into master
+
+    git checkout master
+    git merge cplusplus
+
+