Useful Commands
If a lot of changes has happened upstream you can replay your local changes on top of these, this is done with rebase, e.g.:
git fetch upstream
git rebase upstream/master
This will fetch changes and re-apply your commits on top of these.