I\'m trying to take a branch with changes and bring it back to be identical to the upstream it diverged from. The changes are both local and have been pushed to github, so n
Heavy handed, but hell, what can possibly go wrong?
cp -r .git /tmp
git checkout y
rm -rf .git && cp -r /tmp/.git