alt Hacker NewsGit is fine. I would like something better than fine though, especially for dealing with rebase/merge conflicts where I would say Git is mediocre.
Replies
> 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.
„Claude, merge these branches and resolve conflicts. Ask me if unclear.“
16M$ VC money saved.
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).
> especially for dealing with rebase/merge conflicts where I would say Git is mediocre.
It seems like everyone that hold this opinion want Git to be some magical tool that will guess their intent and automatically resolve the conflict. The only solutions other than surfacing the conflict are locking (transactions) or using some consensus algorithm (maybe powered by logical clocks). The first sucks and no one has been able to design the second (code is an end result, not the process of solving a problem).
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.