Note that you can run git pull -r to rebase your local commits on top of master. If I see some kind of merge I tend to git reset --hard HEAD. But be careful with that since you should have all your stuff committed or it might be lost. There's also git reset --merge. Anyway, it should be fine if I squash it. GitHub has recently made life slightly easier for people who don't wish to mess about with Git itself too much.