title: resolving simple svn conflicts
body: <p>I'm a bit of newcomer to using svn on a mac. I'm using <a href="http://versionsapp.com">Versions</a>. </p>
  
  <p>I've been getting reports that I've been overwriting other devs work, so I'm hoping someone here can make sure I'm doing things properly. </p>
  
  <p>I committed my work last night, the other team members have been working through the night so the first thing I do today is update my repository.</p>
  
  <p>After doing so I receive various files back, I'll use the css file as an example: </p>
  
  <pre><code>myfile.css.r1593
  myfile.css.r1587
  myfile.css.mine
  myfile.css
  </code></pre>
  
  <p>I have a few questions. </p>
  
  <p>What do each of these files represent? </p>
  
  <p>How should I go about fixing the conflict?</p>
  
  <p>What is the safest way for me to work with svn to avoid overwriting other peoples work and avoid making unnecessary copies of files outside of the repo?</p>