Regarding branches and merge conflicts:

Doubling down on using branches means these problems will continue.

Personally, I don’t want to live with problems that are solvable and the only reason we can’t fix them is … what exactly? The resistance to collaborating? Learning how to work in a way you haven’t experienced yet?

If you have problems with merge conflicts, adding more tooling to allow your branches to go on longer without being merged isn’t going to help.

What am I missing? How am I the crazy one for saying this? ‘The Principle Engineer’ disagrees.