What about a vibecoded replacement with emojis and javascript?

Surely $trillion "ai" thing can generate a better solution than one Finnish guy 20 years ago.

„Claude, merge these branches and resolve conflicts. Ask me if unclear.“

16M$ VC money saved.

> Git is fine. I would like something better than fine though, especially for dealing with rebase/merge conflicts where I would say Git is mediocre.

You can define your own merge strategy that uses a custom executable to fix conflicts.

https://stackoverflow.com/a/24965574/735926

Well, yeah, but Git is basically UNIX/POSIX or JPEG. Good enough to always win against better like Plan 9 or JPEG XL (though I think this one may win in the long term).