[Top][All Lists]

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

Re: Merging release branch

From: Dmitry Gutov
Subject: Re: Merging release branch
Date: Sun, 31 Oct 2021 00:36:51 +0300
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0

On 30.10.2021 19:33, Eli Zaretskii wrote:
From: Dmitry Gutov<dgutov@yandex.ru>
Date: Sat, 30 Oct 2021 15:30:30 +0300

And of course, cherry-picking doesn't remove merge conflicts, they
will still need to be resolved.
By the author of the change, that's the point.
Btw, if this is what will make the situation better, we could merge ti
master immediately after pushing to the release branch, by the same

We can try making it a rule.

I think it has always been good form (esp. after making conflicting changes), but people are a little afraid on gitmerge.el.

reply via email to

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