[Monotone-devel] Re: non-content conflicts AKA Openembedded is dumping monotone because it can merge anything

[Bruce Stephens]

Bruce Stephens <address@hidden> writes:

> Markus Schiltknecht <address@hidden> writes:
>
>> Oh.. that makes me wonder how hg and git handle non-content conflicts.
>
> In git, file/file conflicts (where you add distinct files with the
> same name on two branches and merge) are just content conflicts.

I should probably clarify that: the file contents are just merged.  So
if the two distinctly created files happen to be identical, then the
merge just succeeds.

[...]