Jean-Louis Leroy wrote:
Hello,
here's my situation. I have two repositories:
....
Shall I push this patch? (1/1) [ynWvpxqadjk], or ? for help: y
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:
./perl/Tangram-XML/lib/Tangram/XML/Storage/Flat.pm
Probably one or both of your repositories get corrupted somehow. Try
running darcs repair on each. If repair changes anything, you might
then need to revert to get working looking like the repaired pristine.
Edwin
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
