title: Can't commit a delete using git-svn: Your file or directory is probably out of date
body: <p>I've been looking over <a href="https://stackoverflow.com/questions/629048/git-svn-dcommit-error-restart-the-commit">this</a> post, but still can't figure out how to solve my particular issue.</p>
  
  <p>I'm using git-svn locally against a svn repository.  I usually do the following:</p>
  
  <ol>
  <li>git svn rebase (to get the latest from the repo).</li>
  <li>git checkout local-dev</li>
  <li>git merge master (to merge this into my local branch)</li>
  <li>make changes, committing locally as I go</li>
  <li>git checkout master</li>
  <li>git merge local-dev </li>
  <li>git svn dcommit (to sent it all back upstream)</li>
  </ol>
  
  <p>Usually works fine, until I tried to commit my latest batch from the merged master back to the repository:</p>
  
  <blockquote>
    <p>$ git svn dcommit</p>
    
    <p>Committing to <a href="http://mysvnrepository" rel="nofollow noreferrer">http://mysvnrepository</a>    ...
           D       PROJECT/Content/js/dp/jquery-1.3.2.js</p>
    
    <p>Merge conflict during commit: Your file or directory 'PROJECT/Content/js/dp' is probably 
    out-of-date: resource out of date; try updating at C:\Program Files\Git/ libexec/git-core/git-svn line 508</p>
  </blockquote>
  
  <p>I deleted this "/dp" folder sometime in my operations and git appeared to handle everything fine, but now it won't send to to svn.  </p>
  
  <p>Any suggestions on how to fix this?</p>