...
- How to Undo Almost Anything with Git
- If your local branch (master/11.x) gets out of sync with upstream master and just doesn't seem to work right anymore run through this (You may want to save this branch first)
- http://stackoverflow.com/a/1628334/3708872
git checkout mastergit fetch upstream# For master (use 11.x for 11.x) git reset --hard upstream/master