4 ms·
When the contents has a conflict, git and pijul behave similarly. When the contents are identical, but the order of commits is different, git will conflict and
by exDM69 3y ago
When the contents has a conflict, git and pijul behave similarly.
When the contents are identical, but the order of commits is different, git will conflict and require manual resolution. Pijul will not.
As you say, neither will automatically check for correctness and you should run tests and CI when merging.
Pijul just removes the manual work when there is no conflict in the contents but the history is different.
- pmeunier 3y ago> When the contents has a conflict, git and pijul behave similarly. Not really: Pijul can record a conflict resolution as a patch, and apply it in a different context. Also, the conflict doesn't "come back", so you don't need extra hacks like rerere/jujutsu. > Pijul just removes the manual work when there is no conflict in the contents but the history is different. This is true, but could be confusing as our definition of conflicts isn't based on contents, but on operations, which is very different from Git (Git doesn't detect all conflicts).
- jnxx 3y ago> When the contents are identical, but the order of commits is different, git will conflict and require manual resolution. But why would this normally happen? Different developers working on the same files which by chance make the same changes? Isn't that unlikely?