Subversion conflict resolution

I often forget the command for subversion conflict resolution. If you rename or move files, it can sometimes be hard to stop svn from complaining. If you are sure your local copy is correct, you can use this and avoid having to empty and re-download your local copy.

svn resolve --accept=working FILENAME/FOLDERNAME

Leave a Reply