title: Tortoise SVN Merge: Branch->Trunk with Revision History from both Tree
body: <p>we cut branch from Trunk. Changes are done on both trees and committed. Now we want to merge branch to trunk with all the revision history from both. Is it possible?</p>
  
  <p>Is manual merge is different from tortoise SVN merge say i have to do 3-4 files?
  "Means i manually check the changes then do it on trunk and commit the trunk."</p>
  
  <p>I earlier put a question regarding it but still confused.
  Experts comment only.</p>
  
  <p>Thx</p>