Updating a Project and Editing Conflicts with TortoiseSVN

In TortoiseSVN, when getting the latest of multiple files, you may that there were conflicts in the merge process. Before you close this window, just scroll up and right click on the file with the conflict.

Select “Edit conflicts” and use the Merge tool to resolve them.