emacs-devel
[Top][All Lists]
Advanced

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

Re: Merging release branch


From: Eli Zaretskii
Subject: Re: Merging release branch
Date: Sun, 31 Oct 2021 15:03:13 +0200

> Cc: larsi@gnus.org, rgm@gnu.org, stefan@marxist.se, monnier@iro.umontreal.ca,
>  emacs-devel@gnu.org
> From: Dmitry Gutov <dgutov@yandex.ru>
> Date: Sun, 31 Oct 2021 14:38:26 +0300
> 
> On 30.10.2021 15:32, Eli Zaretskii wrote:
> >> Cc:rgm@gnu.org,stefan@marxist.se,monnier@iro.umontreal.ca,
> >>   emacs-devel@gnu.org
> >> 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.
> >>
> >> So I also think it might justify the additional overhead of having to
> >> cherry-pick every change.
> > Many authors don't have write access, though.
> > 
> 
> The responsibility with fall on those who install the change, to no 
> one's surprise.

My point is that in those cases resolving merge conflicts won't be
easier.



reply via email to

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