Hi
When pushing a patch, I get this:
110> ../Development/work/sheff-ctru/prospect % darcs push ../prospect-
datarake-merge
Sun Apr 5 16:34:56 BST 2009 [email protected]
* Fix data.rake to include all required columns
Shall I push this patch? (1/1) [ynWsfvplxdaqjk], or ? for help: y
Backing up ./lib/tasks/data.rake(-darcs-backup0)
There are conflicts in the following files:
./lib/tasks/data.rake
darcs failed: Refusing to apply patches leading to conflicts.
If you would rather apply the patch and mark the conflicts,
use the --mark-conflicts or --allow-conflicts options to apply
These can set as defaults by adding
apply mark-conflicts
to _darcs/prefs/defaults in the target repo.
Ok, fine. What I've done before is set "apply mark-conflicts" to
_darcs/prefs/defaults, and it works.
But I can't understand how to enable conflict marking on a per-push
basis. How do you pass pass --mark-conflicts or --allow-conflicts to
`darcs apply` like it says?
Apologies if I'm missing something obvious.
Thanks
Ashley
--
http://www.patchspace.co.uk/
http://www.linkedin.com/in/ashleymoran
http://aviewfromafar.net/
http://twitter.com/ashleymoran
_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users
