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
- Resolve conflict my looking at the files in question.
- git add
- git rebase --continue