News for hackers. Stuff that matters.
Re:We've raised $17M to build what comes after Git by hk__2 on Friday April 10, 2026 @04:25AM (#47715176)
> 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

There are no comments on this comment yet.