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.
I have a file that I have removed from subversion, however in the mean time someone else has updated this file and it now is in conflict.
I have spoken to them and we are agreed that it should be deleted. Any ideas how we can stop it being in conflict?
You can use the “check for modifications” command to get a list of changed files. There you can revert the conflicted file. This works in the commit dialog too.