[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merge conlict?
From: |
Óscar Fuentes |
Subject: |
Re: merge conlict? |
Date: |
Mon, 25 Jan 2010 11:27:58 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) |
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.
- Re: merge conlict?, (continued)
- Re: merge conlict?, Richard Stallman, 2010/01/26
- Re: merge conlict?, Richard Stallman, 2010/01/26
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?, Lennart Borgman, 2010/01/26
- Re: merge conlict?, Karl Fogel, 2010/01/26
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?, Stephen J. Turnbull, 2010/01/26
- Re: merge conlict?, Richard Stallman, 2010/01/26
- Re: merge conlict?, Stefan Monnier, 2010/01/26
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?,
Óscar Fuentes <=
Re: merge conlict?, Stefan Monnier, 2010/01/25
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?, Andreas Schwab, 2010/01/26
- Re: merge conlict?, Óscar Fuentes, 2010/01/26
- Re: merge conlict?, Andreas Schwab, 2010/01/26
- Re: merge conlict?, Andreas Schwab, 2010/01/26
Re: merge conlict?, Teemu Likonen, 2010/01/25