Merging Two Different Versions of a File

Occasionally, you will need to reconcile two disparate versions of a file in Visual SourceSafe. There are two scenarios where such a need could occur:

• A project was branched into two projects, as described in the section titled "Source-Code Branching." The two projects follow independent development paths from that moment on. Somewhere down the line, however, developers discover the need for a change (a bug fix or enhancement) that is desirable for both projects. Developers make the change in one of the branches and then merge the change to the other branch.

• Multiple developers have checked out the same file at the same time and now want to check in their separate changes.
  

• Creating a New Project Folder in Visual SourceSafe
• Adding Files to a Visual SourceSafe Project
• Setting the Working Folder for a Project
• Checking Out, Checking In, and Getting Working Copy
• Source-Code Labeling and Version Numbers
• Source-Code Sharing
• Source-Code Branching
• Pinning an Earlier Version of a File for Use in the Current Version of a Project
• Merging Two Different Versions of a File