4 ms·
First, even though Pijul has branches, patch commutation means that most Git branches are just regular patches in Pijul. > Wouldn’t Pijul require the same too?
by pmeunier 7y ago
First, even though Pijul has branches, patch commutation means that most Git branches are just regular patches in Pijul.
> Wouldn’t Pijul require the same too?
If you're talking about my point (1) above, the answer to your question is no, because in Pijul, conflicts are resolved by patches, so if a branch has a patch solving a conflict, the conflict cannot come back. So Pijul doesn't need "rerere".
If you're talking about my point (2), the answer is also no: non-associative merges happen for bad reasons in Git. By design, Pijul doesn't have them at all.
- frutiger 7y ago> If you're talking about my point (1) above, the answer to your question is no, because in Pijul, conflicts are resolved by patches, so if a branch has a patch solving a conflict, the conflict cannot come back. So Pijul doesn't need "rerere". No, that’s not what I was asking. Conflicts don’t come back in git either, if you base the change off the merge-base. As I said, if the area around the patch has diverged between the release and development branches, you will need to manually resolve the conflict as you merge from the patch branch (based off the merge-base). That’s nothing to do with git, these tools do not have semantic understanding of your business problem so obviously require human input. My question was, in that case wouldn’t Pujil need assistance too? Your reply: “conflicts are resolved by patches” - indicates there was a conflict that needed to be resolved by a human or not?
- pmeunier 7y ago> My question was, in that case wouldn’t Pujil need assistance too? > Your reply: “conflicts are resolved by patches” - indicates there was a conflict that needed to be resolved by a human or not? Yes, conflicts need to be resolved by humans indeed (sorry for misunderstanding your question).