3 ms·

If you get a bad merge, why not just layer on a series of diffs? In short, a pijul/diff based front end merge tool to git, hg, etc to assist with any challengi

• pmeunier 6y ago
  You could certainly do that, and this is in fact one of the ways to use Pijul. However, you would completely miss out on the most important novelty of Pijul, which is patch commutation: When we say "Pijul is patch-based", we don't only mean that it stores patches, but rather that patches that could be written independently commute, meaning that they can be applied in any order, and are guaranteed to give the same result in all cases (including when they conflict). This simplifies many workflows.
  • gnufx 6y ago
    To be fair, Roundy's idea of commutation was novel in 2002 (unless it was a reinvention of something earlier, which wouldn't surprise me) whether or not it was done right then. I'm happy if Pijul improves something which definitely simplifies workflows and doesn't get me confused after 30 years of revision control and sometimes resorting to diffs.