Hi,
I'm, having quite a weird problem. After darcs get a fresh copy of a remote repository 1) I add some new files 2) darcs record a new patch 3) darcs push the new patch But I get the following error: darcs failed: Refusing to apply patches leading to conflicts. If you would rather apply the patch and mark the conflicts, use the --mark-conflicts option to apply. There are conflicts in the following files: How is it possible since the files were just now added??
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
