Daily Archives: December 4, 2008

SVN merging with TortoiseSVN

If you’re going to perform a merge, I can assume you’ve already created, checked out, and have made modifications to a branch from your code repository.  On your checkout, right click a directory or single file and select “TortoiseSVN” then “Merge” from the context menu.

From the next window, you may need to alter the “From” URL to your repository.  This will most likely be pointing to the same directory or single file in the trunk of your repository.  For beginners, this can be confusing.  What the interface is asking you to do is specify a revision range to merge with your files.  In most cases, the “From” and “To” URL will be exactly the same.  The difference is the “From” entry where you’ll need to specify the beginning revision number to start the merge.  The “To” entry will usually be the “Head Revision” if you’d like to get the most recent commits.  The “result of the merge” will automatically point to your branch.  Perform a “Dry Run” the first couple times until your comfortable with the process.

Watch for conflicts

Edit and resolve conflicts, then commit all changes to your branch.