4 ms·
> Snapshots and diffs are different views of the same thing. Not completely: think of conflict resolutions for example. In patch-based systems such as Darcs an
by pmeunier 6y ago
> Snapshots and diffs are different views of the same thing.
Not completely: think of conflict resolutions for example. In patch-based systems such as Darcs and Pijul, you don't need a "rerere" command to handle that special case.
And I'm sure you'll agree that conflicts is the one critical situation where we need the best possible tool.
> When I git push, I upload my commits (i.e. snapshots). And when I git cherry-pick, I apply a diff
That's not how Git does it. Instead, Git runs 3-way merge, which doesn't do what you expect, see https://pijul.org/manual/why_pijul.html https://pijul.org/manual/why_pijul.html.