Bulk conflict resolution during merge duplicates conflicts

[marioo]

Steps to reproduce the issue:

 

1. Add an xlink on a sub branch,
2. Add an identical xlink on the /main branch of the same repo (choose the same changeset of the destination repo).

This is to cause an evil twin conflict when the branch is later merged.

 

1. Now add another xlink (to a different repo) on the same sub branch,
2. and then add an xlink to the same repo on the /main branch (but choose a different changeset of the destination repo).

This is to cause an xlink conflict during merge.

 

After you perform those four steps, try to merge the sub branch into /main. You should get an evil twin conflict and an xlink conflict (please see the "Conflicts before.png" picture).

 

Then:

1. Select all the conflicts on the list and click "Choose resolution method..." in their context menu.
2. From the window that appears then choose the "Keep the item added on destination (discarding the add on source)" and select the "Apply the action for the next X conflicts" check box (please see the "Resolution.png" picture).
3. Click OK.

This will cause all xlink conflicts to double on the list (see the "Conflicts after.png" picture). However, if you do the same without including the evil twin conflict in the selection, the issue does not occur.

[calbzam]

Hi,

 

I will check the behavior, but anyway I would recommend you to configure the Xlinks in a specific branch (eg. main) and then propagate the changes when creating sub-branches in your parent repository (autoexpansion branches). It´s not a good idea to add identical Xlinks in different sub-branches forcing evil twin conflicts or similar to happen.

 

Regards,

Carlos.

[marioo]

Hi Carlos,

 

Thanks for the explanation. We usually follow this rule, so my report is of low importance. Nevertheless I wanted you to know about that issue.

 

Greetings,

Mariusz.