title: svn: Aborting commit: 'file.xpm' remains in conflict
body: <p>I am very new to svn (basically, all I know is how to use things like ci, co, rm, add, stat, and diff, but no technical details) ,and I'm attempting to check in a major chunk of code. </p>
  
  <p>I'm doing a check-in from the very top of things (with "."), like this: </p>
  
  <pre><code>svn ci -m "Major check-in of restructured GUI classes." .
  </code></pre>
  
  <p>Unfortunately, this creates the following error with an old icon file that existed at some point:</p>
  
  <pre><code> Aborting commit: '/users/nvjulian/Research/5prog/trunk/src/gui/icon/Board.xpm' remains in conflict 
  </code></pre>
  
  <p>I tried to resolve this but was unsuccessful:</p>
  
  <pre><code>[nvjulian@dupin trunk]$ svn rm src/gui/icon/Board.xpm
  svn: Use --force to override this restriction
  svn: 'src/gui/icon/Board.xpm' is not under version control
  </code></pre>
  
  <p>...even when I did it this way:</p>
  
  <pre><code>[nvjulian@dupin trunk]$ svn rm --force src/gui/icon/Board.xpm
  svn: 'src/gui/icon/Board.xpm' does not exist
  </code></pre>
  
  <p>Indeed, this file doesn't exist; it was deleted a long time ago and I didn't find it anywhere after searching my entire computer. I tried these commands from a variety of directory locations and it still didn't work. Actually, when I first did the svn stat to get ready for the check in, I was met with this:</p>
  
  <pre><code>!     C icon/Board.xpm
        &gt;   local delete, incoming delete upon update
  </code></pre>
  
  <p>So I tried to actually do svn up on that file (?), but still, no success. What am I missing here? </p>