From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: Merging release branch Date: Sat, 06 Nov 2021 12:11:12 -0400 Message-ID: References: <83o86xbpkk.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2319"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Nov 06 17:11:50 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 1mjOIH-0000NC-So for ged-emacs-devel@m.gmane-mx.org; Sat, 06 Nov 2021 17:11:50 +0100 Original-Received: from localhost ([::1]:45326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mjOIF-0008B7-QJ for ged-emacs-devel@m.gmane-mx.org; Sat, 06 Nov 2021 12:11:47 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjOHi-0007Wn-27 for emacs-devel@gnu.org; Sat, 06 Nov 2021 12:11:14 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:46330) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjOHh-0002E4-Pq for emacs-devel@gnu.org; Sat, 06 Nov 2021 12:11:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=iMm4u9YsNhidib1doQOKgA2WMLadwUa9hQD+Gt53PN0=; b=Q4d6iWHxXzetW8LfHPdg MZ3JW1izbyONwuW3TjhIshI4okVxFwJIuQ5jvnuuffDJglMPyt1To6b53yv59g590vCnO9vVQvzvi QNeFLVa4sVVFqkXzVCXt9QhN7sYiLwNyuZs/r3YCRaBBHuIn2ETT+0KWnVlyPaQLm7zzbRUCefjEQ jtdGzrdbKj4sYS0k/mfOPWE4R9jxI43qN1hhZrKYRVbWirS7lsivfuQM7OCzXEqWSdgR6KRF83wGQ 3AoKPjty+tMCRifdlq99o/YPOmC01LI8nCvGw9G0akw8iVFLOoX3nCkWzHyjNoSjDxbBmWoJ6XQ0i d89IBw8Q+8kRWQ==; Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.90_1) (envelope-from ) id 1mjOHg-0000zJ-Cy; Sat, 06 Nov 2021 12:11:12 -0400 X-Spook: infowar GEO SBI ASIO Mexican army cryptanalysis GIGN Drug X-Ran: '~!932X+ (Eli Zaretskii's message of "Sat, 06 Nov 2021 11:28:43 +0200") 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:278875 Archived-At: 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?"...