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

[Eli Zaretskii]

> From: Andreas Schwab <address@hidden>
> Cc: John Wiegley <address@hidden>,  address@hidden
> Date: Fri, 25 Mar 2016 10:14:10 +0100
> 
> Eli Zaretskii <address@hidden> writes:
> 
> > There seems to be another issue with merging to master: we get back
> > commits that were cherry-picked from master to the release branch.
> 
> What do you mean with "get back"?  Since they are part of the history of
> the branch and merging incorporates the whole history you will of course
> see them from master.

They were supposed to be skipped during merging, so if what we have
currently is the expected result, then what exactly does "skip" mean
in this context?