This operation is used to merge a parallel with the current version of an object. The merge editor opens in Eclipse. You can see the differences between the two versions and locate the conflicts. The common ancestor is also shown to help resolve conflicts.
To merge two parallel versions, 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.
3. Select two versions and right-click to bring up the context menu.
4. Click Manual Merge to open the merge editor.
5. Use this editor to merge and resolve conflicts.
6. When all the conflicts are resolved, on the Eclipse File menu, click Save. A new version of the object will be created as the result of this operation. Close the merge editor.