[darcs-users] Re: How is merge supposed to work?
Miguel Bazdresch
darcs-01 at thewizardstower.org
Sat Oct 23 08:14:22 UTC 2004
* Mark Stosberg <mark at summersault.com> [2004-10-23 07:54]:
> On 2004-10-22, Miguel Bazdresch <darcs-01 at thewizardstower.org> wrote:
> >
> > Thanks a lot for the explanation. Now I can ask a concrete question. I'm
> > not seeing those markers in the conflict I created. This is what I did:
>
> I believe until recently there were some cases were no conflict markers
> were added, because darcs though it could "intelligently" resolve the
> conflict on it's own. Now it /always/ add conflicts markers. However, I
> don't the version that does this has been released yet.
Ah, I see. Thanks. I've been using 1.0.0rc3, I'll get an updated tree
and see if that improves things.
--
Miguel Bazdresch
http://thewizardstower.org/
More information about the darcs-users
mailing list