title: What does it mean when Source Control Explorer shows both branch and merge for a changeset?
body: <p>I am trying to understand the history of my codebase, which resides in TFS 2005, and I encountered a changeset where all changes were marked as both branch and merge.</p>
  
  <pre><code>Name    Change           Folder
  ------------------------------------------------
  A.cs    merge, branch    $/Root/Solution/Project  
  </code></pre>
  
  <p>I am unable to find anything (especially on MSDN) describing what the various combinations of Add, Edit, Delete, Branch, Merge, Undelete, Encoding, etc mean. Each is pretty self explanatory when used alone and some do not make sense together like Add and Delete so I am looking for information on the legal combinations and what they mean.</p>