title: Resolving a merge conflict when I do svn update
body: <p>I am trying to learn basics of version control by Eric Sink - <a href="http://ericsink.com/vcbe/vcbe_usletter_lo.pdf">http://ericsink.com/vcbe/vcbe_usletter_lo.pdf</a></p>
  
  <p>I am on page 22 now. I'll describe the scenario for you. Two users on the same computer, harry and sally are working on a file called lottery.c which is stored in a repo called lottery. </p>
  
  <p>1 - Harry commits the first/initial code.
  2 - Sally changes it and commits.
  3 - While 2 is happening, harry has made changes, but not committed.
  4 - Harry commits and gets an error.</p>
  
  <pre><code>Transmitting file data .svn: Commit failed (details follow):
  svn: File '/lottery.c' is out of date
  </code></pre>
  
  <p>5 - To fix this, harry will update his local copy using <code>svn update</code>.</p>
  
  <p>This is where I have a problem ! The author says the output is:</p>
  
  <pre><code>lottery harry$ svn update
  G lottery.c
  Updated to revision 2.
  </code></pre>
  
  <p>But, my output is :</p>
  
  <pre><code>lottery harry$ svn update
  Updating '.':
  C    lottery.c
  Updated to revision 2.
  Conflict discovered in file 'lottery.c'.
  Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
          (mc) my side of conflict, (tc) their side of conflict,
          (s) show all options:
  </code></pre>
  
  <p>I am new and I don't know how to respond to this message. Is my book wrong ? Please help me. Thanks.</p>