You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
There are cases when not every node actually appears as a predecessor, such as in delete/delete conflicts (#81). Then, the content for that node is never checked and the PcsInterpreter may flag a content conflict, even though that's not really the issue at hand.
A simple solution is to check the content of both the predecessor and successor for each PCS in the merge. There's no point in checking the parent as well, as a node that never appears as a predecessor or successor will never be processed by the PcsInterpreter, with the exception of the virtual root.
The text was updated successfully, but these errors were encountered:
There are cases when not every node actually appears as a predecessor, such as in delete/delete conflicts (#81). Then, the content for that node is never checked and the PcsInterpreter may flag a content conflict, even though that's not really the issue at hand.
A simple solution is to check the content of both the predecessor and successor for each PCS in the merge. There's no point in checking the parent as well, as a node that never appears as a predecessor or successor will never be processed by the PcsInterpreter, with the exception of the virtual root.
The text was updated successfully, but these errors were encountered: