Svn and merge branches fail. a tree conflict occurs. a folder is added to the branch. When merge is used, a tree conflict occurs in the file. after the merge operation is complete, I found that the branches were not merged into the trunk. could you please take a look at the situation ?, Merge conflicts. We recommend that you check the usage of svn. Svn and merge branches fail, and a tree conflict occurs.
There is a branch. a folder is added to the branch. When merge is used, a tree conflict occurs in the file. after the merge operation is completed, it is found that the branch is not merged into the trunk, let's take a look at the situation?
------ Solution --------------------
Merge conflicts. We recommend that you check the usage of svn.
The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion;
products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the
content of the page makes you feel confusing, please write us an email, we will handle the problem
within 5 days after receiving your email.
If you find any instances of plagiarism from the community, please send an email to:
info-contact@alibabacloud.com
and provide relevant evidence. A staff member will contact you within 5 working days.
