Hello, I get a git merge error trying to convert a git repo to darcs. git merge -n --no-commit fastforward HEAD c62a617e3127a376cdc2e4ab96781a9515bdb5da error: Entry 'io-multiplex/common.lisp' would be overwritten by merge. Cannot merge. fatal: merging of trees 537fe126682d5210acbf9732849e2a954c3f94c3 and 6ae6963f27df7df5eccf27ad85f46a4a41979d59 failed Merge with strategy recursive failed.
Any git users that know what to do about this? I have my configuration file below. The tailor version is the latest from darcs, and the git version is git version 1.6.0.4 (I tried an older version as well). Cheers, Henrik Hjelte [DEFAULT] verbose = True [project] target = darcs:target start-revision = INITIAL root-directory = /home/henrik/lisp/import/tailored/iolib/ state-file = tailor.state source = git:source [darcs:target] look-for-adds = True subdir = iolib [git:source] subdir = originalgit repository = http://common-lisp.net/project/iolib/git/iolib.git _______________________________________________ Tailor mailing list [email protected] http://lists.zooko.com/mailman/listinfo/tailor
