title: TFS Merging Development Branch to Main
body: <p>Our team started using TFS few months back and we are learning as we progress.  We first checked in our existing code to TFS thereby creating a Main Branch. We then created a Development Branch from this Main branch.</p>
  
  <p>We just did a release and I merged Development branch with Main. It asked me to map Main branch folder on my workstation. Done that Merge completed successfully. But after merge I noticed on server that change sets are still old and source code on server has not changed.
  looking further I noticed that the changed file is marked as 'merge pending'. </p>
  
  <p>When I opened solution from mapped folder of main branch, I did see that all changes from Development branch merged to Main are in pending state. </p>
  
  <p><strong>Questions</strong></p>
  
  <ol>
  <li>Do I always have to check in pending changes after each merge in  TFS</li>
  <li>Is is possible to merge source code on server instead of from
  workstation (All code in development is in Checked in state).</li>
  </ol>
  
  <p>I am using VS2012 (if that matters)</p>
  
  <p>Please advise, especially if I am taking a wrong approach with TFS.</p>