Re: merge conlict?

[Óscar Fuentes]

Eli Zaretskii <address@hidden> writes:

>> >> revno: 99379 [merge]
>> >> committer: Mark A. Hershberger <address@hidden>
>> >> branch nick: trunk
>> >> timestamp: Sun 2010-01-24 23:52:26 -0500
>> >> message:
>> >>   merge conflict
>> >
>> > What does this "merge conflict" in the commit message mean?  Why do
>> > so many unrelated files (see below) seem to be modified in one go?
>> 
>> That's a normal merge of trunk into a branch.
>
> Yes, but the "merge conflict" commit message bears some meaning that I
> hope Mark will be able to explain.  Obviously, that meaning is not
> something Bazaar would know about, or care.

I guess that he merged upstream into some local branch and then *pushed*
back to upstream from there. That causes lots of trouble, as we are
realizing.

>> Not much different from
>> eg. address@hidden
>
> That merge is made of Katsumi Yamaoka's changes.  Which is not true
> for Mark's merge.  Thus my questions above.

Right. Katsumi Yamaoka's merge is perfectly fine.