SVN Branch Reintegration
<p>I am trying to figure out what is best practice for reintegrating two separate branches (one branch off trunk,second branch off of branch one) back into trunk.</p>

<p>These branches are essentially feature branches that need to be moved into trunk since they have reached production.</p>

<p>Any help would be appreciated. </p>

<hr>

<p>Trunk on Rev: 400 </p>

<p>B1 Created on Rev:50 From Trunk, Current Rev: 150 </p>

<p>B2 Created on Rev:100 From B1, Current Rev:200</p>

<hr>

<p>Option One: Merge T -> B1, Merge B1 -> B2, Merge B2 -> T, Delete B1 &amp; B2</p>

<p>Option Two: Merge B1 -> B2, Merge B2 -> B1, Merge B1 -> T, Delete B1 &amp; B2</p>

<p>Option Other: ??</p>

<hr>

<p><a href="https://i.stack.imgur.com/2WXtr.jpg" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/2WXtr.jpg" alt="Image Describing Problem"></a></p>