git memo
Create a try branch:
$ git branch try/parser
Switch to a try branch:
$ git checkout try/parser
Pulling from github:
$ git pull . remotes/origin/master
Merge changes from master:
$ git rebase master
Merge changes from a try branch in a single commit:
$ git merge --squash try/parser
(note this will cause conflict for all changes in the future if you try to merge in normal fashion.)
Force delete a try branch:
$ git branch -D try/parser