Possible Conflicts and Their Resolution

Conflict

Diagram

Internal Move | Internal Move

This sequencing conflict is caused from an incompatible internal move on each branch. Windchill RV&S cannot determine which of A D and A C are not in sequence with respect to the Original tree.

To resolve this conflict, select Word or Windchill RV&S from the Document Conflicts dialog box when merging.

External Move | External Move

This sequencing conflict is caused by D externally moving to R in both branches, but relative to different nodes.

To resolve this conflict, select Word or Windchill RV&S from the Document Conflicts dialog box when merging.

Insert | External Move

This sequencing conflict is caused by inserting I between A and B in Word, and moving D between A and B in Windchill RV&S.

Merging to resolve this conflict for Word or Windchill RV&S yields the same result.

Insert | External Move With Duplicates

This sequencing conflict is caused by inserting I and J between A and B in Word, with moving D between I and J; while in Windchill RV&S, inserting K and L between A and B, and moving D between K and L.

Merging to resolve this conflict for Word or Windchill RV&S yields the same result.

Internal Move | External Move

This conflict is caused by moving C between A and B in Word, but re-parented to B in Windchill RV&S.

To resolve this conflict, select Word or Windchill RV&S from the Document Conflicts dialog box when merging.

External Move | Internal Move

This conflict is caused by re-parenting C to B in Word, but repositioning C between A and B in Windchill RV&S.

To resolve this conflict, select Word or Windchill RV&S from the Document Conflicts dialog box when merging.

External Move | External Move

This conflict is caused by re-parenting B to A in Word, and re-parenting B to C in Windchill RV&S.

To resolve this conflict, select Word or Windchill RV&S from the Document Conflicts dialog box when merging.

Internal Move | Delete

This conflict is caused by repositioning B after C in Word, but deleting B in Windchill RV&S.

Merging to resolve this conflict for Word or Windchill RV&S yields the same result.

Merging to resolve this conflict results in a loss of B (which cannot be restored).

Delete | Internal Move

This conflict is caused by deleting B in Word, but repositioning B after C in Windchill RV&S.

To resolve this conflict, select Word or Windchill RV&S from the Document Conflicts dialog box when merging.

Merging to resolve this conflict in favour of Word results in a loss of B (which cannot be restored).

External Move | Delete (Type 1)

This conflict is caused by re-parenting B to C in Word, but deleting B in Windchill RV&S.

Merging to resolve this conflict for Word or Windchill RV&S yields the same result.

Merging to resolve this conflict results in a loss of B (which cannot be restored).

External Move | Delete (Type 2)

This conflict is caused by re-parenting B to C in Word, but deleting C in Windchill RV&S.

This conflict does not give you an option to resolve, but instead displays as a warning in the Document Conflicts dialog box if you proceed with submitting your changes to Windchill RV&S.

Permitting the system to merge to resolve this conflict results in a loss of B and C (both of which cannot be restored).

Insert | Delete

This conflict is caused by inserting node I as a child of B in Word, but deleting B in Windchill RV&S.

This conflict does not give you an option to resolve, but instead displays as a warning in the Document Conflicts dialog box if you proceed with submitting your changes to Windchill RV&S.

Permitting the system to merge to resolve this conflict results in a loss of node I (which cannot be restored).

Delete | External Move

This conflict is caused by deleting B in Word, but re-parenting B to C in Windchill RV&S.

To resolve this conflict, select Word or Windchill RV&S from the Document Conflicts dialog box when merging.

Merging in favour of Word causes a loss of Node B (which cannot be restored).