Merging Concurrent Changes

Top  Previous  Next

The RCS Status command is used to merge concurrent changes of a single file. The Check-in command gives the option of merging concurrent changes of multiple files.

To merge changes in single files:

1.

Open the Document Explorer (refer to Using the Document Explorer Tool in CS-RCS Tools).

2.

Right-click on the desired file and select RCS Status.

The Merge Status Dialog will appear. For more information, refer to The Merge Status Dialog in Branching and Merging.

3.

Performed the required merge.

4.

The file will now appear as 'Modified' and can be checked-in as normal.

To check-in multiple files including files containing conflicts:

1.

Open the Document Explorer (refer to Using the Document Explorer Tool in CS-RCS Tools).

2.

Select the files to be checked-in and select Check-in from the right-click menu or select Check-in from the 'Project' menu to check-in all modified files.

3.

If any files to be checked-in contain conflicts, then the File Merge List Dialog will appear allowing you to resolve conflicts before the check-in is performed. For more information, refer to The File Merge List Dialog in Branching and Merging.

4.

If there are Modified (Manual Merge) files, the process will halt before performing the check-in to allow you to manually merge changes. In this case, all the merged files will appear as 'Modified' and check-in can be performed as normal after manually merging those files which require this.