Merge

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.

If the element type is binary, you can elect to Keep your version or the backed version. AccuRev does not support merging binary files.

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.