<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -45,4 +45,18 @@ Options
  * `--author-map FILENAME`: Allows translations from darcs committer
    name to Git committer name.  The input is a YAML map.  For an
    example see the output of `--author-map`.  The author map will be
-   stored in the repository and will be re-used for future imports.
\ No newline at end of file
+   stored in the repository and will be re-used for future imports.
+
+
+KNOWN ISSUES
+------------
+
+When `darcs-to-git` pulls a conflicting patch it will revert the state
+of the repository to the state before the conflict. *THIS WILL ALSO
+REMOVE ANY LOCAL CHANGES TO YOUR REPOSITORY, INCLUDING GIT COMMITS!*
+You should therefore not commit to the branch you import to, but
+instead work in a different branch.  You can rename your master branch
+after import using:
+
+    $ git branch -m darcs_import
+</diff>
      <filename>README.markdown</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>bc70bf392f33d341bf886afe638376cca50507dd</id>
    </parent>
  </parents>
  <author>
    <name>Thomas Schilling</name>
    <email>nominolo@googlemail.com</email>
  </author>
  <url>http://github.com/purcell/darcs-to-git/commit/7c3754f33a06cf3bc6afb65f8b423664eb8d5567</url>
  <id>7c3754f33a06cf3bc6afb65f8b423664eb8d5567</id>
  <committed-date>2008-05-09T02:19:59-07:00</committed-date>
  <authored-date>2008-05-09T02:19:59-07:00</authored-date>
  <message>Warn about conflict handling issues</message>
  <tree>56bce2477a3e6929e09cffe72e4220a57e2fb6c0</tree>
  <committer>
    <name>Thomas Schilling</name>
    <email>nominolo@googlemail.com</email>
  </committer>
</commit>
