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

[Eli Zaretskii]

> From: David Engster <address@hidden>
> Cc: John Wiegley <address@hidden>,  address@hidden
> Date: Fri, 25 Mar 2016 10:15:41 +0100
> 
> 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.

What does "their content" include, exactly?

> This is how it worked with Bazaar as well.

With Bazaar, there was a clear mainline, displaying which these
commits wouldn't appear at all.  We don't have that with Git, so the
analogy doesn't really help.