This is a forced update to send the master branch back in time to the point where it was working. When you pull from master after this commit git might complain and go a little crazy on you. Read what git tells you to do before asking me for help. If all else, use git reset to go to the commit 82d3463, then run git checkout . and then pull from the master and it should be fine. And yes, you are removing all working done after that commit from your master. do NOT merge in a branch that has the history after that commit as it's screwed up and the ui. Use git cherry-pick to grab changes from another branch.