title: TFS merging and diff between branches
body: <p>I am implementing a TFS branching structure where there is a MAIN integration branch, a Production branch which contains code released to production, and a Development branch. Both Dev and Prod are branched off Main. </p>
  
  <p>Any concurrent development will be done on sub-branches which will be branched off the Development branch and I would like any changes made to the regular Development branch to merge back to the sub branches as required. I can't see any way to automate merges but one thing I thought of was having a nightly or weekly diff process that looks at the two branches and sends an email report of differences between say the Development branch and each Sub Branch.</p>
  
  <p>Does anyone have any thoughts on this and if there are any products I could use to do the auto-diff and report emailing?</p>
  
  <p>Thanks</p>