title: SVN - Summary of conflicts: Skipped paths : 1
body: <p>I recently tried to do an <strong>svn up</strong> and got the following:</p>
  
  <pre><code>Conflict discovered in 'myapp/protected/config/myapp/mode_staging.php'
  </code></pre>
  
  <p>I was given a number of options and I (probably the wrong choice now) choose to [p] Postone.</p>
  
  <p>Now when I try to run the svn up I get the following message everytime (plus the site itself has a white screen of death)</p>
  
  <pre><code>Skipped 'myapp/protected/config/myapp/mode_staging.php
  At revision xxx.
  Summary of conflicts:
    Skipped paths: 1
  </code></pre>
  
  <p>Clearly the mode_staging.php is the problem - what is the best/easiest way to resolves this?</p>