About conflicts between derivatives

The Project Merge Tool identifies conflicts when a change to an item or folder in one derivative differs from a change made to the same item or folder in another derivative. This means that conflicts are only detected for merges with at least two derivatives. Here are some examples where conflicts would be reported:

  • If an item addition is reported in more than one derivative but is different between the derivatives.

  • If an item is deleted from one derivative and is marked as a modification in another.

  • If an item is modified in more than one derivative but is different between the derivatives.

  • If an item has been moved in more than one derivative but has been moved to a different location in each derivative.

Back to top

See also: