title: resolve property conflicts in svn
body: <p>I saw this line from the free svn online book:</p>
  
  <blockquote>
    <p>"To resolve property conflicts, simply
    ensure that the conflicting properties
    contain the values that they should,
    and then use the svn resolved command
    to alert Subversion that you have
    manually resolved the problem."</p>
  </blockquote>
  
  <p>I had a conflict in my repo with the svn:ignore property. I fixed the conflicts as was said in the .prej file generated by the conflict</p>
  
  <p>How do I tell SVN that the conflict with the property is now resolved?</p>