...
Conflicts occur for any inconsistency between files that we cannot determine a default behavior for. In most situations, the Merge app will prioritize more recent changes than older ones for the same object based on the time stamps in the dialog. However, in some cases specific changes conflict with others and there is not viable way to determine the default behavior. Sometimes specific changes are prioritized regardless of their timestamp. | |||||||
  | |||||||
The following types of changes are likely to generate merge conflicts: Conflicting Staging task Assignment : Objects cannot be assigned to multiple staging tasks. As a result if an object is assigned to different staging tasks in files that are attempting to be merged together this will generate a merge conflict. Absence of Change Time : for any change that is made where a change time was not recorded the entry in merge will be marked as a conflict. | |||||||
...