Re: merge conlict?

[Andreas Schwab]

Eli Zaretskii <address@hidden> writes:

>> From: Andreas Schwab <address@hidden>
>> Cc: address@hidden,  address@hidden
>> Date: Mon, 25 Jan 2010 11:19:03 +0100
>> 
>> 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?
>
> Compare the names of committers and log messages in this:
>
>   99377.1.10: Katsumi Yamaoka 2010-01-21 [merge] (Score File Format): Fix 
> typo.

That's not address@hidden

>> > Which is not true for Mark's merge.
>> 
>> Both commits merge trunk into a branch.  How are they different?
>
> Mark's branch seems to include commits that I think belong to
> mainline.

Just like the other one.  That's the whole point of merging trunk.

Andreas.

-- 
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."