When I merge with TSVN, is there a text file where I can see in which files there were conflicts?
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
When I merge with TSVN, is there a text file where I can see in which files there were conflicts?
If you did the merge you already solved the conflicts. Furthermore TortoiseSVN nor SVN do record the files which where in conflict. So the answer is no. There is no file generated. If you didn’t solved the conflicts you can see the files which are in conflict via TortoiseSVN “Check for Modification” or on command line via
The lines which are prefixed by a “C”