[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merge conlict?
From: |
Eli Zaretskii |
Subject: |
Re: merge conlict? |
Date: |
Mon, 25 Jan 2010 12:08:43 +0200 |
> From: Andreas Schwab <address@hidden>
> Date: Mon, 25 Jan 2010 10:26:24 +0100
> Cc: "Mark A. Hershberger" <address@hidden>, address@hidden
>
> >> 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.
> 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.
Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?,
Eli Zaretskii <=
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Eli Zaretskii, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Eli Zaretskii, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
Re: merge conlict?, Óscar Fuentes, 2010/01/25
Re: merge conlict?, Andreas Schwab, 2010/01/25
Re: merge conlict?, Eli Zaretskii, 2010/01/25
Re: merge conlict?, Óscar Fuentes, 2010/01/25