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 revert "location of conflict folder" -R
svn cleanup
svn update

用于恢复当前目录

svn revert . -R

2018-03-08 04:03:58

其他回答

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

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

下面还有一个解决方案，

如果整个文件夹被删除，SVNis抛出错误“admin file . SVNis missing”，将使用以下方法将冲突解决到工作状态。

svn resolve --accept working "file / directory name "

2013-11-26 09:55:16

为了使用命令行消除冲突，我使用以下命令

svn revert "location of conflict folder" -R
svn cleanup
svn update

用于恢复当前目录

svn revert . -R

2018-03-08 04:03:58

给出以下命令:

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仍然存在冲突?

推荐文章

最新文章

标签