t.doc</samp>. You
  will be in Track Changes mode automatically. Go through the document to
  accept, reject or merge any changes. Save the document and exit MS Word when
  you are ready. Finally, issue the <code>fcm resolved</code> command to remove
  the conflict status:</p>
  <pre>
(SHELL PROMPT)$ fcm resolved document.doc
=&gt; svn resolved document.doc
Resolved conflicted state of 'document.doc'
(SHELL PROMPT)$ fcm status
=&gt; svn st
M      document.doc
</pre>

  <p>Another type of conflict that you m