The automatic merge operation will use Synergy’s built-in merge and conflict resolution tool. A new version of the object will be created automatically. This operation will not change your current version.
To merge two parallel versions automatically, follow the steps below:
1. Open the Synergy History view.
2. Identify the two versions you want to merge. Make one of them the current version. The two versions must be in a static state.
1. Select two versions and right-click to bring up the context menu.
2. Click Automatic Merge.
3. An automatic merge is performed and a new working version of the object will be created. The resulting version may contain conflict markers if automatic merge was unable to resolve certain conflicts. Open the newly created version and check for any conflict markers.
The automatic merge operation will bring up the following merge tool.