Well, What Do You Expect?

Like maybe if you botch the merge it might somehow still build?

Whatever. Well, here I am back at the orifce for the 13th day running. Ten minutes to fix the spurious merge conflict, and now I'm running the test suite, leaving me with nothing particularly better to do than surf the Web while waiting for the tests to run.