title: TFS: Updating branch with changes from main
body: <p>So, we have our main dev line, I create a branch, and developer b creates a branch.  We both do some work.  developer b finishes his work, merges back into the main dev line.  I know his changes will affect me, and rather than deal with the conflicts later, I would like to update my branch, with the changes that are now in the main dev line, so I can deal with them in my branch, prior to merging back into main.</p>
  
  <p>How do I do that?</p>