[darcs-users] Re: identical change conflict?

Aaron Denney wnoise at ofb.net
Tue Mar 22 21:50:50 UTC 2005


On 2005-03-22, Deliverable Mail <deliverable at gmail.com> wrote:
> On Tue, 22 Mar 2005 16:23:57 +0000 (UTC), Aaron Denney <wnoise at ofb.net> wrote:
>> This has been brought up before.  It is in fact necessary that they
>> conflict, given how darcs works.  See
>> http://www.darcs.net/pipermail/darcs-users/2004-December/004649.html
>
> In that thread, David Roundy answers that darcs used to be "smart"
> about resolving identical change conflicts.

No, it didn't resolve them.  They sat around in the repository as
conflicts, but _unmarked_ conflicts, which confused people.

-- 
Aaron Denney
-><-





More information about the darcs-users mailing list