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

[David Engster]

Eli Zaretskii 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.

When you merge a branch, you have to merge all of it. But when they are
marked as 'skipped', they will be merged with strategy "ours",
effectively ignoring their content. This is how it worked with Bazaar as
well.

-David