title: Fixing a directory conflict in subversion
body: <p>I have a working copy that I cannot check in due to a conflict.  How do I update to the latest revision but yet keep my local changes to the files in the server directory?</p>
  
  <p>i.e. here is what I have on my system</p>
  
  <pre><code>bob@blaze:~/dev/store$ ls -l
  total 24
  drwxr-xr-x 5 bob bob 4096 2010-09-23 00:17 Library
  drwxr-xr-x 2 bob bob 2010-09-30 12:22 linclient
  drwxr-xr-x 3 bob bob 4096 2010-09-30 12:15 server
  drwxr-xr-x 3 bob bob 4096 2010-09-29 15:19 test_client
  drwxr-xr-x 3 bob bob 4096 2010-09-30 10:11 test_scripts
  </code></pre>
  
  <p>Now, there should be a directory called client, I actually moved it under windows to test_client so it's all up to date.  But for some reason I can't get client to update to
  the real client.  The error I'm getting is this:</p>
  
  <pre><code>bob@blaze:~/dev/store$ svn commit
  svn: Commit failed (details follow):
  svn: Aborting commit: '/home/bob/dev/store/client' remains in conflict
  </code></pre>
  
  <p>Subversion is great, until it breaks.  There is no conflict as such, it's just that the .svn folder contains a file that indicates a conflict.  How do I fix it so I can update and get the client directory to be downloaded to my working copy as well?</p>