SVN 提交期间合并冲突
Eclipse + Subversive 插件
在提交与 SVN 不同步的目录时，会弹出一条消息：
Merge conflict during commit
svn: Commit failed (details follow):
svn: File or directory '.' is out of date; try updating
svn: resource out of date; try updating
尝试从 Eclipse Navigator 视图更新整个项目（右键单击>刷新或 F5），但问题仍然存在。
在这种情况下有什么可以做的吗？
Eclipse + Subversive plugin
On commiting a directory which is out of sync with the SVN a message pops up:
Merge conflict during commit
svn: Commit failed (details follow):
svn: File or directory '.' is out of date; try updating
svn: resource out of date; try updating
Tried to update the whole project from Eclipse Navigator view (right click>Refresh or F5) and the problem still persists.
Is there something that can be done in this case?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（6）
您在 Eclipse 中混淆了两种不同的操作：
和
“更新”意味着从版本控制系统检索文件的最新版本。 “刷新”只是意味着 Eclipse 将更新其本地文件系统的视图，以防文件在 Eclipse 外部发生更改。
您需要进行更新（团队->更新）。
You are mixing up two different operation in Eclipse:
and
"update" means retrieve the most recent version of a file(s) from the version control system. "Refresh" just means that Eclipse will update its view of the local filesystem, in case a file was changed outside Eclipse.
You need to do an update (Team->Update).
您应该更新、解决冲突，然后再次提交。
有关解决 Eclipse 中冲突的帮助，请参阅此链接。
You should update, resolve conflicts, then commit again.
See this link for help on resolving conflicts in eclipse.
有时 eclipse+subversion 会有点迷失，需要更强大的解决方案：
Sometimes eclipse+subversion gets a bit lost and a more robust solution is called for:
您需要执行 svn update 以确保在提交之前完全是最新的。
如果更新不起作用，您可能需要进行清理。
如果您使用的是这两个命令，那么您应该能够在 Eclipse 之外的 SVN 客户端中找到这两个命令。
You need to do an svn update to make sure you are completely up-to-date before committing.
If the update does not work, you may need to do a cleanup.
You should be able to find both of these commands in your SVN client outside of Eclipse if you are using one.
尝试删除 .svn/all-wcprops。 也许会有帮助
try to delete .svn/all-wcprops. maybe it will help
其他人已修改了您的此目录。
在提交之前，您需要执行 svn update 以获得最新版本。
或
刷新或 F5 只会重新读取当前签出的内容并检查本地更改，即在 eclipse 外部进行的更改。
svn update 命令将远程所做的任何更改（提交）拉到您的工作区。
Someone else has modified this directory on you.
You need to do a svn update to get the latest version before commiting.
or
Refresh or F5 will only re-read what's currently checked out and check for local changes, i.e. changes made outside of eclipse.
The svn update command pulls any changes made remotely (commits) down to your workspace.