INFO: Merging SourceSafe Files

MORE INFORMATION

The MERGE command (Merge Branches in Visual SourceSafe 4.0)takes the two ASCII text files and combines them. SourceSafe merges the original file (the last version of the file in SourceSafe prior to the separate or the multiple checkout action) and the file copies which have been modified.

When two users have a file checked out, the first user to update can do so with no problem. If there is a conflict (see next paragraph), the next user is told that a conflict exists and asked if the files were merged. The file will be copied to the Working directory with the conflicts marked. You should manually edit the file to resolve the conflicts and update the file.

As an example of a conflict, suppose that the original file contains the following line of code: X = 4. This original file is checked out by two users through either the multiple checkout or the share and separate (Branch in Visual SourceSafe 4.0). If one user changes the line of code to read: X = 5 and the other user changes the same line of code to read: X = 3, there is now a conflict. The first person to check in changes and merge has no problem. When the second person tries to check in the file and merge, the following message is given: The file has the following:

      <<<<<<< $/<project1>/<filename>
      X = 3
      =======
      X = 5
      >>>>>>> $/<project2>/<filename>
				

When manually editing, you have to strip out the >>>>>>> comments and decide which of the two changes should really be there. Then when you try to check in the conflict modified file and merge, you get the following message: This message just makes sure that the conflicts have been fixed. Answer Yes and continue with your work. The changes are now merged.

NOTE: Merging only works correctly on ASCII files. For instance, FoxPro's SCX and SCT files or Visual Basic's FRX files are binary files and will not be merged correctly by SourceSafe.

To summarize:

1. Checkout, modify, and Update (Check in Visual SourceSafe 4.0) $/PROJECT/STARS.BAS. Highlight the file in the SourceSafe interface.
2. Select Merge (Merge Branches in Visual SourceSafe 4.0) from the SourceSafe menu.
3. The dialog lists a shared version of the file, as well as separated versions. Highlight the specific version you wish to merge with.
4. Select the Merge push button.
5. If there are any conflicts, you will be asked to resolve the conflicts and update the resulting file.