[darcs-users] fixing conflicts in darcs
kknowles at soe.ucsc.edu
Mon Nov 29 16:20:50 UTC 2004
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.
More information about the darcs-users