title: Merging Branch in TortoiseSVN with history
body: <p>I am working in a simple repository, with a truck and one branch. No change s have been made to the trunk since the branch, and a number of commits have been made on the branch. How do I merge the branch back into the trunk so that I get the full history included changes while it was in the branch in one history?</p>