Merging Versions of a Link

Basic Merge Algorithm

What Constitutes a Change to a Link?

Link Merge Procedure

The Merge command can merge changes made to element in two different contributor Either of two versions of an element, which are to be combined in a merge operation, producing a new version of the element. This can involve both content changes and namespace changes. versions.

Basic Merge Algorithm

The basic procedure for handling changes in a merge operation is the same for all elements, including link elements:

For a more detailed discussion, in the context of changes to the contents of a text file, click here.

What Constitutes a Change to a Link?

Given that the algorithm for handling changes is basically the same for all elements, the only thing special about merging versions of a link is the nature of changes to a link element.

Each of the above changes creates a new version of the link element.

Link Merge Procedure

Execution of the Merge command on a link element never involves the Merge tool (or third-party tool), which is designed to process the contents of text files. A conflict at the content-level merge is handled by a link-specific dialog:

 

 

 

 

 

 

A conflict at the namespace-level merge involves making choices in the same one or two dialogs used for all kinds of elements.