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.
There is a project A on the Trunk, and its two branches A1 and A2. Both A1 and A2 are under developing for a while.
Now I want to merge changes of A2 to A1. I am using Intellij IDEA’s “merge from…” feature and set A2 a branch of A1’s. However, after I selected which revisions to merge, and clicked ok, it comes “tree confilct” in src/main folder.
Does anyone have the same problem?
“Tree confict” error is ordinary case for Subversion, Subversion merge. It appear 100% on merge-trees, when in two future merge-sources,the same file (in different parts) is changed and renamed
In order to workaround: merge conflicted files (you’ll see filename of file-in-question in temp-file name) and only after it – parent dirs