Re: [tei-council] git help

Thank you Raff (and Elisa)! I think that worked, as I had no uncommitted changes to worry about. (And there are ways to worry about them in that Stack Overflow post.)

This will help: http://stackoverflow.com/questions/2389361/undo-a-git-merge-that-hasnt-been-...

To summarize: use `git log` to find the sha of the last commit before the merge, then hard reset to that commit with:

$ git reset --hard commit_sha

You will lose uncommitted changes, though.