svn local dir delete incoming dir edit upon update

New situation: Local files not known to svn, update no longer conflicting. svn: how to resolve local edit, incoming delete upon update message svn st + C foo > local edit, incoming delete upon update + C bar > local edit, incoming delete upon update touch foo bar svn revert foo bar rm foo bar If the conflict is about directories instead of files then replace touch with mkdir and rm with rm -r. Revert the files to the state svn likes them (that means deleted): $ svn revert foo bar In my case here, I had a copy of the data that was just checked in successfully, so I wasnt too worried. New situation: Local files to be added to the repository (yeah right, svn, whatever you say), update still conflicting. Summary of conflicts: Tree conflicts: 1 Tree conflict on epsilon > local dir delete, incoming dir edit upon update Select: (mc) prepare for updating moved-away children, if any (recommended), (p) postpone, (q) quit resolution, (h) help: p Summary of conflicts: Tree conflicts: 1 svn st D C epsilon > local dir delete, incoming dir edit upon. 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. Keep the project in Visual Studio open while performing switch to trunk. This happens when you edit a file, while someone else deleted the file and commited first. Add project to SVN and commit (ignore folder bin and obj on SVN level) Make sure that there are no pending changes or unversioned files.

local edit, incoming delete upon update

Svn local dir delete incoming dir edit upon update