[darcs-users] Help understanding the push with conflicts message

Trent W. Buck trentbuck at gmail.com
Fri Apr 10 13:06:47 UTC 2009


Ashley Moran <ashley.moran at patchspace.co.uk> writes:

> On 9 Apr 2009, at 14:36, Eric Kow wrote:
>> I think the conclusion was that I would (somewhat reluctantly) accept
>> patches for darcs push --mark-conflicts and darcs push --allow-
>> conflicts
>> being options.
>
> Thanks for the link.  Sorry for not searching the archives.
>
> How about making `darcs push --mark-conflicts` and `darcs push
> --allow-conflicts` only work on local repositories?

I think the blocker on this work is a volunteer to write the code.
An implementor could certainly start off by supporting these options
only on local repos, but I think they are just as useful for remote
repos, so I'd still like that functionality as an end goal.



More information about the darcs-users mailing list