title: Handling conflicts in SVN with Tortoise?
body: <p>Any time an issue comes up like a merge conflict or something similar, it really slows me down.</p>
  
  <p>Can someone explain to me how to force-resolve conflicts?</p>
  
  <p>For example, a buddy of mine made an edit to a file on the repository and committed.  While he was doing that, I had already renamed that file and made many edits to it on my working copy.</p>
  
  <p>When I went to commit, I get the conflict error obviously.  The file he edited doesn't even exist anymore on my working copy.  How can I tell SVN to simply quit crying about the conflict and force it to accept my working copy (ie, overwrite the head revision with my working copy).</p>