title: TFS Branching - 2 Development branches
body: <p>I currently use TFS and have the following structure.</p>
  
  <p>A Dev line, a Mainline and a Release line in my TFS hierarchy. I use the same approach as detailed in the below link :</p>
  
  <p><a href="http://blog.tfsserver.com/a-straightforward-guide-to-branching/" rel="nofollow">http://blog.tfsserver.com/a-straightforward-guide-to-branching/</a></p>
  
  <p>(I plan on keep 2 or 3 most recent releases in the release line)</p>
  
  <p>The mainline is the most recent version of code and a new release folder will be created to keep when the mainline code is tested and approved.</p>
  
  <p>Currently in my dev line I have a dev branch which was created from the mainline.</p>
  
  <p>This exsiting dev branch is currently being worked on by a developer where the changes will be ready in 4 weeks lets say.</p>
  
  <p>I currently need to make urgent changes to the current version of code in production (Mainline) and I know these changes will take me 2 weeks to complete and test.</p>
  
  <p>With this in mind, I obviously dont want to use the existing dev branch.</p>
  
  <p>I cant make changes directly on the mainline so I am wondering if the following approach I am condsidering is the correct approach?</p>
  
  <p>I am thinking I need to :</p>
  
  <p>(1) Create a NEW Dev branch from the mainline.
      I would then have my original/existing dev branch and now a NEW dev branch.
      Both would be branched therefor from the same original code.</p>
  
  <p>(2) Make my changes in the NEW dev branch</p>
  
  <p>(3) Once I am happy with my changes, I would then merge my changes with the Mainline and release the    changes to production ( or selected customers) and merge my changes with the original Dev branch. 
      Then, when the original dev branch changes are completed 2 weeks after mine, it would be merged        with the mainline.</p>
  
  <p>I am wondering is this the correct approach?
  Can I merge changes from the NEW branch to the existing dev branch even if I didnt create my new branch from the existing/original dev branch?</p>
  
  <p>Thanks</p>