title: How to merge branches in VSS?
body: <p>i'm trying to merge a branch in Visual SourceSafe 6.</p>
  
  <p>Here you see the bug in the 'main line' code base:</p>
  
  <p><a href="https://i.stack.imgur.com/CEd8P.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/CEd8P.png" alt="alt text"></a></p>
  
  <p>A hotfix branch was created, and the file was fixed:</p>
  
  <p><a href="https://i.stack.imgur.com/VrWEN.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/VrWEN.png" alt="alt text"></a></p>
  
  <p>Now it's time to merge the hotfix back into the main line development. i select the file i want to merge, and hit the <strong>SourceSafe</strong> &rarr; <strong>Merge Branches...</strong> menu option:</p>
  
  <p><a href="https://i.stack.imgur.com/wdMgC.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/wdMgC.png" alt="alt text"></a></p>
  
  <p>With the merge complete, i confirm that the main line now contains the hotfix, which it does not:</p>
  
  <p><a href="https://i.stack.imgur.com/bvXE9.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/bvXE9.png" alt="alt text"></a>
  </p>
  
  <p>So what is the proper technique to merge branches in Visual SourceSafe 6?</p>