danielnolan/git-rebase.markdown

 git checkout -b <branchname>

 git add
 git commit -m "description of changes"

 git checkout master
 git pull --rebase

 git checkout <branchname>
 git rebase master

 git checkout master
 git merge <branchname>
 git push

1. Resolve conflict my looking at the files in question.
2. git add
3. git rebase --continue