When i try to merge from branch to trunk using SVNTortoise, it just overwrites everything with branch copy, doesn’t ask me to resolve any conflicts. Does anybody know why? “Merge non-interactive” checkbox is not checked.
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 try to merge from branch to trunk using SVNTortoise, it just overwrites everything with branch copy, doesn’t ask me to resolve any conflicts. Does anybody know why? “Merge non-interactive” checkbox is not checked.
“Reintegrate branch” algorithm differs from a regular merge. It assumes that you already merged everything from trunk to feature branch and thus resolved conflicts there. So reintegrating merge (almost) copies feature branch to the trunk.
Citation from http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html