rebase

rebase.txt

1) `git checkout master`
2) `git pull origin master`
3) `git checkout <your branch>`
4) `git rebase master`
5) edit the file that conflicts, make it look right, remove all ==== and <<<<< and >>>>> that the conflict tool inserts.
6) `git add <file>`
7) `git rebase --continue`
8) repeat 5-7 until complete
9) `git push origin <your branch> --force`