ay be able to resolve manually is where
  the binary file is generated from another file which can be merged. For
  instance, some people who use LaTeX also store a PDF version of the document
  in the repository. In such cases it is easy to resolve the conflict by
  re-generating the PDF file from the merged LaTeX file and then issuing the
  <code>fcm resolved</code> command to remove the conflict status. Note that,
  in this particular case, a better approach might be to automate the
  generation of the P