From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Merging release branch Date: Sun, 31 Oct 2021 09:19:15 +0200 Message-ID: <83fsshoe4s.fsf@gnu.org> References: <87bl37vg9l.fsf@gnus.org> <87y26bu0ih.fsf@gnus.org> <83pmrnppqy.fsf@gnu.org> <874k8yspb4.fsf@gnus.org> <835ytepvad.fsf@gnu.org> <51ab9b37-7c1b-0b71-4875-265ac402a756@yandex.ru> <83lf2ao4jz.fsf@gnu.org> <87f4237f-466c-d84c-de75-26b828776c7a@yandex.ru> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="34625"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rgm@gnu.org, larsi@gnus.org, stefan@marxist.se, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Oct 31 08:20:14 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mh58Y-0008m6-Gr for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 08:20:14 +0100 Original-Received: from localhost ([::1]:49606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mh58W-0007dq-Hl for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 03:20:12 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mh57p-0006x2-0f for emacs-devel@gnu.org; Sun, 31 Oct 2021 03:19:29 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:45406) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mh57n-0003JL-TX; Sun, 31 Oct 2021 03:19:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=vShnPNibJ3D43SDZEsp4gHAMgnwcWtnysxTkHFq1FJI=; b=o40OsUJQxjfq Sc3inoTqLOAcfZD8dR+m0bR6gbJJF2yB53r6Ec+1pD1NOkbtYfxZgUVFFjLkeOWotXRwU1MeN4Inu tTTj6hwNJh0weUzJLwxH4HNj2nKd6CVtYMwWvIWGo4zQpW3wShOTe8jGREc590bN8oi9ICmRf5y+s ubLOA32Y1lPHLN9FFh/T0p0X+zDJzxKXzf0XabNYeRP73FJfbLmcxqR27K0m5TcZMr/uMuqHslHqA r0nZ6U+guyDigayHWZkYzi7goumskkA7yppmdh2HQkIQOCsigGo+nsXgJqpXhvbkTeMKFBASZJFBV a1f7VZ5IJWcUqBmyNlhb5g==; Original-Received: from [87.69.77.57] (port=1955 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mh57m-0004dr-3s; Sun, 31 Oct 2021 03:19:26 -0400 In-Reply-To: <87f4237f-466c-d84c-de75-26b828776c7a@yandex.ru> (message from Dmitry Gutov on Sun, 31 Oct 2021 00:36:51 +0300) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:278300 Archived-At: > Cc: larsi@gnus.org, rgm@gnu.org, stefan@marxist.se, monnier@iro.umontreal.ca, > emacs-devel@gnu.org > From: Dmitry Gutov > Date: Sun, 31 Oct 2021 00:36:51 +0300 > > >> 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 > > committer. > > 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. I see no reason to be afraid of gitmerge.el. If there are no conflicts (and most of the time there aren't), it "just works". If there are conflicts, then their resolution is outside of gitmerge.el's scope anyway. I guess those people should try using gitmerge.el once or twice in their local clones, to convince themselves that there's no real problem here.