emacs-devel
[Top][All Lists]
Advanced

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

Re: Missing changes in merges from emacs-25 to master


From: Óscar Fuentes
Subject: Re: Missing changes in merges from emacs-25 to master
Date: Fri, 25 Mar 2016 20:29:01 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.92 (gnu/linux)

Eli Zaretskii <address@hidden> writes:

>> will correctly produce nothing. But I agree it's unfortunate that you
>> cannot see this from the merge commit alone. But I'm not sure what you
>> mean with the entire issue being moot. How do you suggest we deal with
>> commits that shouldn't land in master?
>
> Sorry, I should have made it clear I was talking only about the
> backported commits.

A backported commit still can produce a conflict if the code affected by
that commit is modified again later on master.




reply via email to

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