@@ -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