Revert the files to the state svn likes them (that means deleted): $ svn revert foo bar New situation: Local files to be added to the repository (yeah right, svn, whatever you say), update still conflicting. 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, in addition to the 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 edit, incoming delete upon update
0 Comments
Leave a Reply. |