How to use tortoise SVN to resolve conflicts

0
hi i comited my project to team server it is showing that use tortaise resolver SVN to resolve conflicts. but application running fine with out errors. how to remove conflicts and commite mycode.
asked
2 answers
4

Instal SVN version 1.7. Check what is causing the confilcts. You can then rightclick the file and select resolved in Tortoise or if a commit is needed you can commit the change in Tortoise. After that you can do a commit again in the modeler.

Regards,

Ronald

 

answered
-1

All the versions with download link: https://sourceforge.net/projects/tortoisesvn/files/
Version 1.7,15 did the trick!

answered