Great, then it’s time to commit your branch, and continue your work.
Tortoise SVN will even suggest a commit message, a concatenation of messages from the commits that you just finished merging.
In typical lazy developer fashion, I went with updating SVN to version 1.7 for Mac OS X.
To give due credit, the foundations of this post came from a post on Building SVN 1.7.
Although I expanded on it, I encourage you to read the original post.
Furthermore, I liked the smaller footprint of SVN 1.7.
You begin using Subversion by copying a directory from a remote repository to a local directory on your file system. Subversion uses a copy-modify-merge model meaning that you can add and edit files and directories in your working copy like any other files on your system, but you should use subversion commands for everything else such as Most sub-commands take file and/or directory arguments, recursing on the directories.
If no arguments are supplied to such a command, it recurses on the current directory (inclusive) by default.
You will return to the SVN dialog box where you decided to edit the conflict, except this time you’ll click Resolved.
Rinse and repeat for the remaining files with conflicts.
The next time you try to merge both code sources a conflict will arise, since SVN doesn’t know which line of code to use. That means reviewing the file where the conflict happened and choose which version is legit.