[Monotone-devel] Re: Lack of conflicts checking

[Bruce Stephens]

"Julio M. Merino Vidal" <address@hidden> writes:

> On 06/08/2007, at 18:03, Bruce Stephens wrote:

[...]

>> I suppose monotone could warn (or give a conflict) if, when merging, a
>> file has been modified in one branch and dropped in another, on the
>> grounds that the modifications might be significant in some way and so
>> shouldn't be silently dropped.  That seems likely to lead to lots more
>> false-positives than would be useful, though.
>
> And this is exactly what I expected.

Yes, maybe that would be OK.  I guess it depends on usage---I could
imagine it being very annoying (I don't care about your modifications
to something if I've deliberately dropped that subtree of files), but
depending on how your project tended to work it might well be the
better way to go.