Merging files

You can merge files to compare, accept, or reject differences between files and combine the changes into a new file. Surround SCM automatically merges changes when files are checked in. If there are conflicts, you are prompted to merge the files. You can merge the file in your working directory with the server file, a branched file, or a historic version of the file.

  1. Select the file.
  2. Choose Activities > Merge.
  3. The Merge dialog box opens. Read-only information about the selected file is displayed in the File to Merge Into area of the dialog box.

  4. Select a Second File option.
  5. Click Advanced to select a branched file or historic version of the file. The second file area expands with the following options:
  6. Click Merge.
  7. The merge utility opens. For additional information about the utility refer to the application’s documentation.

    Did you know? You can also manually merge files. For example, Sue is close to the end of a development cycle and is testing software changes in her workspace branch. She keeps coming across the same bug during testing. Pat mentions he fixed the bug and it is in the latest version of the file. Sue decides to merge Pat’s changes into the file in her working directory. This lets her fix the bug without losing any of her work.