swagwhe.blogg.se

If the conflict is about directories then replace touch with mkdir. Recreate the conflicting files: $ touch foo bar Initial situation: Local files are missing, update is conflicting. Should svn resolve not work, for whatever reason, you can do the following: Instead of being content svn now complains that the local files are missing and that there is a conflicting update which ultimately wants to see the files deleted. Realising that deleting the file is the right thing to do you delete the file from your working copy. As a good svn citizen you do an update before a commit. This happens when you edit a file while someone else deleted the file and commited first. > local delete, incoming delete upon update Note: the same procedure also work for the following situation: $ svn st If the conflict is about directories instead of files then replace touch with mkdir and rm with rm -r. local edit, incoming delete upon update