Subversion conflict with a deleted file

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 sho开发者_开发知识库uld be deleted. Any ideas how we can stop it being in conflict?

---

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

---

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.

---

I had a similar problem and used revert on the folder that contained the deleted file given that the latest commit did not contain the file. The only problem is that you need to commit first any other changes you made in the folder