SVN remains in conflict?
svn
Solution
Give the following command:
svn resolved <filename or directory that gives trouble>
(Thanks to @Jeremy Leipzig for this answer in a comment)
Problem
How do I get this directory out of conflict? I don't care if it's resolved using "theirs" or "mine" or whatever... ``` 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 ```