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: Sat, 06 Nov 2021 19:19:46 +0200 Message-ID: <83y2619p71.fsf@gnu.org> References: <83o86xbpkk.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9057"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Nov 06 18:20:52 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 1mjPN6-0002CB-IV for ged-emacs-devel@m.gmane-mx.org; Sat, 06 Nov 2021 18:20:52 +0100 Original-Received: from localhost ([::1]:47736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mjPN4-0007VS-KX for ged-emacs-devel@m.gmane-mx.org; Sat, 06 Nov 2021 13:20:50 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjPMH-0006i3-6V for emacs-devel@gnu.org; Sat, 06 Nov 2021 13:20:01 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:48974) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjPMG-0007Fs-V4 for emacs-devel@gnu.org; Sat, 06 Nov 2021 13:20:00 -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=7EBlg8WUacrzK9Eu8IEy3pXF52JexCs56TzdvM8HvtM=; b=oRaEahGTVrh9 jifyBgxlOKgq8014hQyIBf8EPQRMJ8Dwgsr6RLfCrowyhsHuP2lWcp53e+Q2MlD9R73rKHhABgJZC HirrDPXV1JbIraOz4iRuwbemQneS1j/nNOoamVCmCcAF/Bs3qV4VuggyFbnCyLcg/j97hf6CH5R78 HsWFyguaujMGatCCaM28pm7Trb94IWoM5BAOPiIfevnQuEMFs+DI/QrI44rwDdCjKXlOQxhVS6a0C wpDVj1TeQwmUacn+HVpgGSJZ7j28NAXBPN3vQ9p/i7sMO4XGDUGv2bF1HnMKGMXiP2iTCUk9YOaTJ 4VOQiXWHHUMzpg5IEFPgNg==; Original-Received: from [87.69.77.57] (port=1333 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 1mjPMG-0007Gw-Fq; Sat, 06 Nov 2021 13:20:00 -0400 In-Reply-To: (message from Glenn Morris on Sat, 06 Nov 2021 12:11:12 -0400) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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:278881 Archived-At: > From: Glenn Morris > Cc: emacs-devel@gnu.org > Date: Sat, 06 Nov 2021 12:11:12 -0400 > > Eli Zaretskii wrote: > > > What's the procedure with merging commits that change etc/NEWS on the > > release branch? > > gitmerge.el does have special handling for NEWS (I wrote it). > https://debbugs.gnu.org/29366 > > git reset --hard 5a01383 > emacs -Q -nw -l ./admin/gitmerge.el -f gitmerge > RET > m > y # "Try to fix NEWS conflict?" > y > y > > works for me. > > Surely you weren't saying "n" to "Try to fix NEWS conflict?"... No, I was saying "y" (I think), and then it would put me in a buffer with conflicts, all of which were from trying to merge the branch's NEWS into the master's. I guess some debugging is in order.