INFO: How the Merge Process Works in Visual SourceSafe (159270)
The information in this article applies to:
- Microsoft Visual SourceSafe for Windows 5.0
- Microsoft Visual SourceSafe for Windows 6.0
- Microsoft Visual SourceSafe, 16-bit, for Windows 4.0
- Microsoft Visual SourceSafe, 32-bit, for Windows 4.0
- Microsoft Visual SourceSafe, 16-bit, for Windows 4.0a
- Microsoft Visual SourceSafe, 32-bit, for Windows 4.0a
This article was previously published under Q159270 SUMMARY
This article explains how the merge process works in Visual SourceSafe. The
merge process requires three files: an original, and two modified versions
of the original. During the merge process, Visual SourceSafe makes two
comparisons: one between the original file and the first modified version,
and another between the original file and the second modified version. If a
change is made in only one file, the change is inserted into the merged
file. If there are changes in both files in the same location, then a
conflict exists. The user must resolve a conflict manually.
REFERENCES
Visual SourceSafe version 6.0 Help: Merge Branches
"Microsoft Visual SourceSafe User's Guide," versions 4 and 5, Chapter 6.
Modification Type: | Major | Last Reviewed: | 5/4/2001 |
---|
Keywords: | kbinfo KB159270 |
---|
|