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.
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.
