A lot of people have taken on git too, but at this point it’s so entrenched I’m not sure it’s going away anytime soon.

Maybe we’ll have more agentic SCM that auto solves merges and all that fun stuff in the future. But for now we are stuck with a pretty challenging piece of software