SVN仍然存在冲突?

如何将这个目录从冲突中删除?我不在乎是用“他们的”还是“我的”或其他什么来解决……

PS C:\Users\Mark\Desktop\myproject> svn ci -m "gr"
svn: Commit failed (details follow):
svn: Aborting commit: 'C:\Users\Mark\Desktop\myproject\addons' remains in conflict

PS C:\Users\Mark\Desktop\myproject> svn resolve --accept working C:\Users\Mark\Desktop\myproject\addons
Resolved conflicted state of 'C:\Users\Mark\Desktop\myproject\addons'

PS C:\Users\Mark\Desktop\myproject> svn ci -m "grr"
svn: Commit failed (details follow):
svn: Commit item 'addons' has copy flag but an invalid revision

PS C:\Users\Mark\Desktop\myproject> svn update
   C addons
svn: Can't move 'addons\debug_toolbar\templates\debug_toolbar\.svn\tmp\entries' to 'addons\debug_toolbar\templates\debug
_toolbar\.svn\entries': The file or directory is corrupted and unreadable.

PS C:\Users\Mark\Desktop\myproject> svn cleanup

PS C:\Users\Mark\Desktop\myproject> svn update
Skipped 'addons'
At revision 51.
Summary of conflicts:
  Skipped paths: 1

PS C:\Users\Mark\Desktop\myproject> svn ci -m "grrr"
svn: Commit failed (details follow):
svn: Aborting commit: 'C:\Users\Mark\Desktop\myproject\addons' remains in conflict

当前回答

好吧，下面是如何修复它:

svn remove --force filename
svn resolve --accept=working  filename
svn commit

更多详情见:http://svnbook.red-bean.com/en/1.8/svn.tour.treeconflicts.html

2010-12-29 02:58:50

其他回答

我在linux上也有同样的问题，但我无法用公认的答案解决它。我能够解决它通过使用cd到正确的文件夹，然后执行:

svn remove --force filename  
syn resolve --accept=working filename  
svn up

这是所有。

2017-12-04 06:27:27

我也有类似的问题，这就是它是如何解决的

xyz@ip:~/formsProject_SVN$ svn resolved formsProj/templates/search

解决了formsProj/templates/search的冲突状态

现在更新你的项目

xyz@ip:~/formsProject_SVN$ svn update

更新“。”:

选择:(mc)保留受影响的本地移动， (r)标记解决(打破移动)，(p)推迟， (q)退出解析，(h)帮助:r(选择“r”选项解析)

解决了formsProj/templates/search的冲突状态

冲突总结: 树冲突:0个剩余(1个已经解决)

2015-09-10 05:02:17

好吧，下面是如何修复它:

svn remove --force filename
svn resolve --accept=working  filename
svn commit

更多详情见:http://svnbook.red-bean.com/en/1.8/svn.tour.treeconflicts.html

2010-12-29 02:58:50

给出以下命令:

svn resolved <filename or directory that gives trouble>

(感谢@Jeremy Leipzig在评论中给出的答案)

2011-05-31 06:34:47

我想正确的解决方法是:

(1) backup your-file/your-directory
(2) svn revert your-file/your-directory
(3) svn update your-file/your-directory
(4) Merge the backup your-file/your-directory to the updated one.
(5) svn ci -m "My work here is done"

2016-12-02 21:00:34

SVN仍然存在冲突?

推荐文章

最新文章

标签