Home > Article > Backend Development > svn，merge旁支失败，出现树冲突
svn，merge旁支失败，出现树冲突
- WBOYOriginal
- 2016-06-13 10:29:351170browse
svn，merge分支失败，出现树冲突
有个分支，分支里新增了文件夹，merge的时候那个文件出现树冲突，merge操作完成后，发现分支并没有合并到主干里，请各位大侠看看这是什么情况？
------解决方案--------------------
合并冲突。建议去看看svn的用法。
Statement：
The content of this article is voluntarily contributed by netizens, and the copyright belongs to the original author. This site does not assume corresponding legal responsibility. If you find any content suspected of plagiarism or infringement, please contact admin@php.cn
Previous article：由框架产生的有关问题，询问有什么好的解决办法不？Next article：nginx+php-fmp 内存储器不释放