News for hackers. Stuff that matters.
Re:Jujutsu for Busy Devs by baq on Tuesday July 22, 2025 @10:21AM (#44647248)
> as long as they don’t have conflicts. If they do, you’re in for a rough time. I struggle to see how a vcs could help with that, even if I’d be happy to be proven wrong.

A vcs can allow you to commit conflicts and then commit their resolutions whenever necessary. This has been pioneered by darcs (IIRC) and jj also allows that.

There are no comments on this comment yet.