Performing a merge or rebase

With a mount for a versioned connector configured, you can merge and rebase assets in Explorer.

1. In Explorer, select the asset or assets that you want to merge or rebase.
2. Choose Versioning > Branches > Merge/Rebase.
3. Select Merge or Rebase.
4. Select whether this merge or rebase is recursive and/or atomic.
5. Click Next.
   WorldServer then finds all selected assets which need to be merged or rebased. In the next screen, a list of these assets can be downloaded by clicking Download Log.
6. Select which assets this operation should be performed on by clicking the check box next to each asset.
7. Click Perform Merge or Perform Rebase.
   WorldServer then merges or rebases these assets. If any operations cannot be performed automatically, they fail and are flagged, giving you the option to resolve the assets interactively through a two-way merge tool, as follows:
   1. Click the icon to the left of the asset to launch your pre-configured two-way merge tool (by default, this is WinMerge, but you can specify a different tool in Tools > User Preferences).
   2. The files are automatically checked out and downloaded to your local machine. Merge and edit the two files in your merge tool.
   3. WinMerge displays the two files side-by-side in a split view with differences highlighted. Gray regions signify lines that are present in the other file, but not in the current file. Yellow regions on both sides indicate that each file contains the specified lines, but that they are different from each other.
   4. You can select which difference to work with by clicking the region or by using the navigation buttons in the toolbar.
   5. The Copy Right button copies the left file's version of the text into the right file and synchronizes the two files on the left file's version. Each file may also be edited directly via an integrated text editor. Any changes made with the text editor will then be reflected in the file comparison window with new differences highlighted.
   6. When the merge is complete, the files are automatically uploaded back to WorldServer and checked in (or an Undo Checkout is performed if assets are unchanged) to ClearCase.