如何使该目录摆脱冲突?我不在乎它是否使用“他们的”或“我的”或其他什么来解决......
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 resolved <filename or directory that gives trouble>
(感谢@Jeremy Leipzig 在评论中给出的答案)
关于SVN 仍然存在冲突吗?,我们在Stack Overflow上找到一个类似的问题: https://stackoverflow.com/questions/2406469/