Hi Ashley, On Thu, Apr 09, 2009 at 14:20:39 +0100, Ashley Moran wrote: > 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?
Ah! This actually came up recently http://lists.osuosl.org/pipermail/darcs-users/2009-March/018053.html I think the conclusion was that I would (somewhat reluctantly) accept patches for darcs push --mark-conflicts and darcs push --allow-conflicts being options. Since I don't think we followed up on that last post with a bugtracker entry, I've added http://bugs.darcs.net/issue1429 -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9
pgpolCcTOWtBm.pgp
Description: PGP signature
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
