You should learn `git rebase` :)