The Merge command merges your version of the file with the version in the backing stream. This command is the equivalent of Resolve in other source code management terminologies.
It is enabled only when a file’s status is (overlap). For text files, AccuRev uses the merge tool you have configured. This can be AccuRev’s own merge tool, the Eclipse tool, or a third-party tool that you specify. See Using Alternative Diff and Merge Tools for more information
If the element type is binary, you can elect to Keep your version or the backed version. AccuRev does not support merging binary files.
The Merge command can be run, perhaps multiple times, when you run the Commit All Outgoing Changes and the Update All Incoming Changes commands in the Synchronize view.
If the element type is text, executing Merge brings up a merge tool. By default, the merging of text-file contents is performed by AccuRev's own Merge tool, which uses a three-way merge algorithm.
A successful Merge ends with a Keep command, creating a new version of a file in your workspace.
Note: AccuRev uses a separate executable to perform Merge operations. Check that your environment variables and system path are correctly defined so this executable is available to the Integration.
See also: Merge: When Changes Would Collide.