与 Subclipse 合并时出现树冲突
我正在使用 Eclipse 8.6 和 Subclipse 1.6 以及 svn 1.6.x 服务器。我创建了一个分支，在分支和主干中进行了一些更改，现在我尝试从主干合并到该分支。我得到的只是分支根下每个目录和每个文件的树冲突。即使在我的测试项目中我除了编辑一个文件之外什么也没做，我也得到了这一点。问题是我不明白这些树冲突意味着什么，因为我没有改变任何东西。我只更改了一个文件进行测试，我应该在合并期间获得文件更新，但这只是被忽略。 我在合并窗口中看到的只是根目录下每个目录和每个文件的树冲突图标。另外，在“树冲突”窗口下，它告诉我每个树冲突的“本地添加，合并时传入的添加”。
I am using Eclipse 8.6 and Subclipse 1.6, and svn 1.6.x server. I created a branch, made some changes in both branch and trunk, and now I am trying to merge from trunk to this branch. All what I am getting is nothing but tree conflicts for every directory and every file under the root of the branch. I get that even with my test project where I did nothing but edited one file. The problem is that I don't understand what these tree conflicts mean, since I did not change anything. I have only changed one file for testing and I am supposed to get the file update during merge, but this simply gets ignored.
All I see in the merge window is tree conflict icons for each directory and each file under the root. Also under Tree Conflics window it tells me "local add, incoming add upon merge" for each of the tree conflicts.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（3）
右键单击项目>团队>显示树冲突
然后选择冲突标记为已解决。
之后提交应该可以工作。
Right click Project > Team > Show tree conflicts
then select conflicts as mark as resolved.
The commit should work after that.
解决冲突是一个很好的开始。
Resolving Conflicts is a good starter.
您是否已添加任何自动格式化或启用类似功能？
以下线程可能有助于解决您的问题。
http://www.mail-archive.com/< span class="__cf_email__" data-cfemail="b7dfd6c5dad8d9ce9ad3d2c1f7ded9d4c2d5d6c3d8c599d6c7d6d4dfd299d8c5d0">[电子邮件受保护]/msg05535.html
Have you have added any autoformating or anything of that sort enabled ?
The below thread might help resolve your problem.
http://www.mail-archive.com/[email protected]/msg05535.html