I screwed up my git-annex setup and to fix it I had to revert a merge, for which this blog post was useful:
As I use git more it’s sort of taking the place of Mercurial as my version control software of choice; it’s really cool just how much it can do so that your development process can go forward in the most appropriate way; git is flexible enough to let you do that. Since I don’t write code most of this is irrelevant though…