Re: Some proposed backports from master to emacs-25

[David Engster]

Noam Postavsky writes:
> On Sun, Oct 2, 2016 at 10:05 AM,  <address@hidden> wrote:
>>
>> Git added "cherry picked from commit" but it looks like
>> gitmerge-skip-regexp wouldn't match that, should I change it to match?
>>
>
> What about this question?

If the cherry-pick succeeds without conflict, git can detect them
through the patch-id and add a cherry-mark, which in turn will make
gitmerge ignore those commits.

If there is a conflict, you will have to manually commit anyway and you
should add 'backport' to the commit message.

-David