3 ms·
This kind of "feature branch composability" can be challenging, because the code on the branches turns out to not be entirely orthogonal.
by dboreham 5y ago
This kind of "feature branch composability" can be challenging, because the code on the branches turns out to not be entirely orthogonal.
- hinkley 5y agoThere’s a whole nasty class of bugs introduced by bad merge resolution. Mark was a senior front end Dev who was bad at complex logic. He sat near me and I took pity on him, helped him out to help us out. Steve was smarter and more experienced but had attention to detail problems and did not understand git. He should have been one of my lieutenants but I could not trust him and often had to help him do branch surgery. Steve did not like this arrangement but it couldn’t be helped. He got cranky about it and went after Mark. I can’t prove he was coming at me sideways, but it was curious. One day Steve claims Mark broke our shit. Here’s this line with his name on it. It even looked like a Markism. But the thing was, I reviewed that code. I remember being happy Mark got it right on the first try. This was not the code I merged but git says it is. Da fuq? So I start bisecting and looking at branches and sure enough, Steve screwed a three way merge, again, and blame treated the change as if Mark wrote it. Thanks, you stupid git.