title: How to fix Tree conflict issue in SVN
body: <p>I am new to SVN. </p>
  
  <p>I found a conflict message as shown below:</p>
  
  <pre><code>rahulv@SWS306:~/sp/s2$ svn status
  M       Gemfile
  M       Gemfile.lock
  M       config/intializers/secret_token.rb
  D     C tmp
        &gt;   local dir unversioned, incoming dir add upon update
  D       tmp/cache
  ?       tmp/data
  D       tmp/pids
  D       tmp/sessions
  D       tmp/sockets
  Summary of conflicts:
    Tree conflicts: 1
  rahulv@SWS306:~/sp/s2$
  </code></pre>
  
  <p>The issue occurred after updating using 'svn up' command.</p>
  
  <p>How to fix this issue?</p>