MPS 2019.3 Help

VCS merge hints

The VCS merge language aspect

Define VCS merge hints

The VCS merge aspect language aspect defines strategies to automatically resolve merge conflicts for nodes, their children, references and properties. This is typically useful for non-business values, such as diagram coordinates.

mergehints1

You can specify whether ours or theirs strategy should be applied for the selected elements. If no strategy is selected for an element, a manual resolution will be triggered in case of a merge conflict.

Last modified: 4 February 2020