Git really is a pretty remarkable piece of software that's pretty much become the de facto version control system, at least for new software.
Very powerful. And not always the easiest to reason with.
I know myself that sometimes I get myself into such a tangle with a merge that I just want to forget about it all and start again from some known point where everything worked and compiles as expected!
And that's exactly what happened last night - a combination of too many branches and weird merge interactions leading to very strange behaviour. This time though, I was only an observer, but I think we got through it in the end.
Lesson learned - too many branches leads to ex-tree-me confusion.
[Image credit: John Brian Silverio]