3 ms·
Those commits you were having issues with in git, have you tried putting them into pijul to be sure it doesn't have the same problem? Because so far I have yet
by Izkata 3y ago
Those commits you were having issues with in git, have you tried putting them into pijul to be sure it doesn't have the same problem?
Because so far I have yet to understand why pijul's "set of applied patches" would do anything different than git rebase/cherry-pick. Those work by applying the diffs of each commit to the new tree. Sounds like the same thing to me, or at least close enough to result in the same conflicts.
- baq 3y agoGit does not work with patches internally. Pijul does. This is where all the differences in merging happen. If git worked with patches, git rerere wouldn’t be a thing. https://pijul.org/manual/why_pijul.html https://pijul.org/manual/why_pijul.html
- deleted 3y ago[deleted]