[darcs-users] Dealing with File Addition Conflicts

[Benjamin Franksen]

Curt Sampson wrote:
> On 2008-06-23 22:21 +0100 (Mon), Eric Y. Kow wrote:
>> Do you think it would be feasible for conflicting adds to be marked up
>> sensibly?  I.e. in the working directory, one of the adds happens (seems
>> easy), and both hunks get thrown in on top (maybe not so easy?)
> 
> As above, I'd say just write out two copies of the file, one from each
> patch, and bingo, problem solved.

I agree that this would be cool.

Cheers
Ben