Microsoft KB Archive/142157

= DOC: Merge Branches Option Doesn't Work at Project Level =

Article ID: 142157

Article Last Modified on 5/1/2001

-

APPLIES TO


 * Microsoft Visual SourceSafe 4.0 Standard Edition
 * Microsoft Visual SourceSafe 5.0 Standard Edition
 * Microsoft Visual SourceSafe 6.0 Standard Edition

-



This article was previously published under Q142157



SUMMARY
The Merge Branches option is Dimmed (unavailable) when a project is selected. It is not possible to Merge an entire project from the Visual SourceSafe Explorer. This occurs even though you follow the directions outlined in the Visual SourceSafe Help file in the "Merge Branches" topic and "Merging Files & projects" subtopic, which state that to merge branches:


 * 1) Click the file or project you want in Visual SourceSafe Explorer. Then on the SourceSafe Menu, click Merge Branches. Visual SourceSafe displays the Merge dialog box.
 * 2) In the Project box, click the project that has the version of the file from which you want to merge changes.
 * 3) Click Merge.



MORE INFORMATION
You can merge all of the files in a project using the Visual SourceSafe Command line. Follow these steps:

 Switch to the project that you want to merge the files into:

SS CP $/

 Use the merge command on the project you want to merge files from. Use *.* as the last parameter after the project name as in this example:

SS MERGE $//*.*

The merge command will merge each file in the project specified with the files in the Current Project.

NOTE: SS MERGE will not work recursively. That is, it will not merge files in subprojects of the project specified. You must merge each subproject using the two-step procedure. If a conflict occurs during the merge, Sourcesafe will notify you with the message:

"An automatic merge has occurred and there are conflicts. Edit \ to resolve them"

You will then need to open the specified file in a text editor for manual resolution. There is no Visual Merge option when merging from the command line.

