Permalink
Browse files

Warn about conflict handling issues

  • Loading branch information...
1 parent bc70bf3 commit 7c3754f33a06cf3bc6afb65f8b423664eb8d5567 @nominolo nominolo committed May 9, 2008
Showing with 15 additions and 1 deletion.
  1. +15 −1 README.markdown
View
@@ -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.
+ 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
+

0 comments on commit 7c3754f

Please sign in to comment.