[darcs-users] why do identical changes have to be conflicts?

[Tommy Pettersson]

On Sun, Dec 05, 2004 at 07:01:46PM +0100, Norbert Nemec wrote:
> This is true for adding files only. For hunk patches, there should not be any
> problem.
> 
> Furthermore: even for adding files, I don't see the problem. If you don't add
> any content, there is no conflict. If both patches add the same content,
> there is no conflict either - obviously, both wanted to create the same file.
> If both add different content, you get the regular conflict of the content.

I'd like to throw in an alternative view on conflicts.
If two developers start to write the same lines of code,
there is a conflict about who should write that code.

Of course that doesn't mean there couldn't be a simple way
to resolve the duplication in darcs.  If it really is a
duplication and not just a hunk with some common code in two
otherwise conflicting patches.

So, inside darcs "ignore one of them" is a simple resolution,
but outside of darcs the fact that the same file or the
same lines of code comes from two different sources, could
very well mean something much more important than "ignore
one of them".  Or, it could just be a hunk with some common
code in two otherwise not conflicting patches.  It's hard
for darcs to know.


-- 
Tommy Pettersson <ptp at lysator.liu.se>