Subversion conflict with a deleted file

Question

I have a file that I have removed from subversion, however in the mean time someone else has updated this file and it now is in conflict.

I have spoken to them and we are agreed that it should be deleted. Any ideas how we can stop it being in conflict?

Answer 1

You can use the svn resolved command to remove the conflict state and commit again.

Answer 2

You can use the "check for modifications" command to get a list of changed files. There you can revert the conflicted file. This works in the commit dialog too.