News for hackers. Stuff that matters.

A comment on Pijul: A intuitive VCS unlike Git that's based on sound theory of patches. Parent comment

Re:Pijul: A intuitive VCS unlike Git that's based on sound t... by guitarbill on Friday September 25, 2020 @08:22PM (#24595380)
> Patches can be applied to a conflicting repository, leaving the conflict resolution for later. (from the docs)

but you still have to resolve the conflicts at some point, right? and it doesn't say how this is done. so it isn't clear if this approach is less painful in practice when you apply a bunch of patches.

[ Parent | on HN ]
Re:Pijul: A intuitive VCS unlike Git that's based on sound t... by gnufx on Saturday September 26, 2020 @07:12AM (#24597908)
I haven't used pijul, but I'm familiar with darcs and manually resolving the conflict with a new patch. You still have the conflicting patches, which you can manipulate. There's no claim of magic resolution, and I don't see why having it in the model is a negative.
[ Parent | on HN ]