[darcs-users] fixing conflicts in darcs

Erik Bågfors zindar at gmail.com
Mon Nov 29 19:28:07 UTC 2004


On Mon, 29 Nov 2004 08:20:50 -0800, Kenneth Knowles
<kknowles at soe.ucsc.edu> wrote:
> On Mon, Nov 29, 2004 at 07:56:37AM +0100, Erik Bågfors wrote:
> > send/push.  The   problem with this is that I get patches that create
> > conflicts, then patches that only fixes conflicts.  I would prefer to
> > change the conflicting patch instead.
> 
> You'll probably get a lot of answers about how to mutate patches, but I think
> your initial approach is the most natural way to handle conflicts, analagous to
> resolving CVS conflicts then checking in.

No, in cvs I only have none-conflicting checkins, simply, because I
never check something in if it's conflicting. In darcs, it may not
conflict when I record but will when I push/send.

It's not the same

/Erik




More information about the darcs-users mailing list