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.