Surely that reinforces the argument - there are now a million LOC in a different language, needing stunning amounts of work to validate it actually functions? Writing the code has never been the bottleneck.
If I'm following correctly, the conflicts arise from other commits made to main already - you've implicitly caught branch A up to main, and now you need catch branch B up to main, for a clean merge.
I don't see how there is any other way to achieve this cleanly, it's not a git thing, it's a logic thing right?
Are you mistaking your interactions with low level trades roles (the guy who's making bank fixing power sockets on the weekend) with say, the people maintaining factory electrical systems? or designing them?
Currently contracting for FoodStorm@Instacart.
(used to) Run Ultra Marathons in my spare time.
Feel free to email me on any topic.