Re: merge conlict?

[Óscar Fuentes]

Andreas Schwab <address@hidden> writes:

> Eli Zaretskii <address@hidden> writes:
>
>>> Not much different from
>>> eg. address@hidden
>>
>> That merge is made of Katsumi Yamaoka's changes.
>
> I don't understand that sentence.  Can you clarify?
>
>> Which is not true for Mark's merge.
>
> Both commits merge trunk into a branch.  How are they different?

Katsumi Yamaoka merges his changes into trunk, which is the normal
practice.

If my guess is right, Mark merged trunk into his private branch, and
then pushed to upstream, which is very wrong.