Apply local commits on top of another branch's history
git rebase -i master (Then follow the directions in the terminal for merge conflicts)
git rebase -i master