Conflict Issue.

Hello Team,  I made several changes but while updating/committing, I am getting this error. Please see the attachment.   Conflicts are not showing to my “Changes” so I can change using mine/theirs. What could be the reason for this?    Thanks in Advance.   Regards, Ankit  
1 answers

The most likely reason (the only one I have experienced) is a conflict in one of the files in your project directory. Go to Project->Show Project in Explorer Directory, go on directory up, right-click your projectname, hover over TortoiseSVN, click Resolve. SVN will tell you which of your files are conflicting with their committed version.