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 performing a merge in Subversion there is an option to Test the merge. I have often seen this test uncover conflicts, but then when the actual merge is performed those conflicts do not occur. Does anyone know why this sometimes happens?
Generally this happens when there are multiple distinct ranges. Subversion will test merge the first range and see no conflicts. It then test merges the second range checking against your current working copy. Because the first range has not been applied the working copy is not in a good state to merge the second: you get a conflict. When actually merging the first range does get applied to the working copy. The second range is then able to merge without issue.