title: Subversion conflict with a deleted file
body: <p>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.</p>
  
  <p>I have spoken to them and we are agreed that it should be deleted. Any ideas how we can stop it being in conflict?</p>