We would need an answer to the question we asked here to be able to move forward. Otherwise, without extra info, we would need to discard.
An error occurred while saving the commentMaurizio Margiotta commented
The changeset id and name are for sure welcome, but I would also add that I got a conflict showing the exact same GUIDs as both branches that were merging had an xlink updated to the same changeset. So under the subject of "improving xlink conflic resolving", I'd say that this situation could also be automated.