[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: splitting ChangeLogs
From: |
Eli Zaretskii |
Subject: |
Re: splitting ChangeLogs |
Date: |
Wed, 06 Apr 2011 21:08:08 +0300 |
> From: Stefan Monnier <address@hidden>
> Cc: address@hidden, address@hidden, address@hidden
> Date: Wed, 06 Apr 2011 12:53:21 -0400
>
> > What conflicts? there are no conflicts (assuming you have the
> > changelog_merge plugin).
>
> Well, in my view, the changelog_merge plugin resolves conflicts
> resulting from a merge more than it performs a merge, but I don't know
> if the implementation matches my mental image of it.
It doesn't. changelog_merge completely replaces the default merge
method. In fact, it falls back on the default method if its own
fails.
- Re: splitting ChangeLogs, (continued)
Re: splitting ChangeLogs, Glenn Morris, 2011/04/06
Re: splitting ChangeLogs, Eli Zaretskii, 2011/04/06
Re: splitting ChangeLogs, Stefan Monnier, 2011/04/06
Message not availableRe: splitting ChangeLogs, Stefan Monnier, 2011/04/06
Re: splitting ChangeLogs,
Eli Zaretskii <=
Re: splitting ChangeLogs, Juanma Barranquero, 2011/04/06
Re: splitting ChangeLogs, Glenn Morris, 2011/04/06
Re: splitting ChangeLogs, Stefan Monnier, 2011/04/06