undo, reverse merge
If there is a conflict while merging:
1. stay on master/test
2. open the offending file
3. pick one section to keep and delete the other
<<<<<<< HEAD to ======= is other people's work
======= to >>>>>>> 07202015_MW_gitignore_fix_v1.0 is my work
4. git add <filename>
5. git commit -m "merging 07202015_MW_gitignore_fix_v1.0"
5. git push origin master/test
undo merge
git reset --merge