When I'm committing a change, I receive the message: “One or more files are conflicted, use TortoiseSVN to resolve these conflicts.” What is TortoiseSVN  and how to use this to resolve the conflicts? Thanks in advance!  
1 answers

Hi Xander,

have a look at

This will tell you which version to download. After installing, reboot PC or it might not work.

After that you can right-click on your project directory folder, and select the "Edit conflicts” or the "SVN Resolved” this will show you what is conflicted and you can solve it. 

In the settings of Tortoise you can select which you want to see, when right clicking any folder.