title: SVN Merge conflict during commit
body: <p>Eclipse + Subversive plugin</p>
  
  <p>On commiting a directory which is out of sync with the SVN a message pops up:</p>
  
  <pre><code>Merge conflict during commit
  svn: Commit failed (details follow):
  svn: File or directory '.' is out of date; try updating
  svn: resource out of date; try updating
  </code></pre>
  
  <p>Tried to update the whole project from Eclipse Navigator view (right click>Refresh or F5) and the problem still persists.</p>
  
  <p>Is there something that can be done in this case?</p>