Re: Incorrect merge

[Óscar Fuentes]

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.