[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Incorrect merge

From: Óscar Fuentes
Subject: Re: Incorrect merge
Date: Tue, 02 Nov 2010 00:02:49 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

Eli Zaretskii <address@hidden> writes:

>> > Should we have improved procedures to avoid such incidents in the future?
>> Definitely.
> Suggestions are welcome.

The problem is that not everything that is committed on emacs-23 branch
is intended to be merged into trunk. The solution is obvious: don't
merge stuff from emacs-23 into trunk. Just use another branch (let's
call it `common-fixes') where patches intended for trunk and emacs-23
are applied. Then you merge `common-fixes' into trunk and emacs-23.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]