From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: merge conflict tedium Date: Thu, 10 Jan 2019 20:05:03 -0500 Message-ID: References: <87ftu4gp4z.fsf@gmx.de> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1547168958 8522 195.159.176.226 (11 Jan 2019 01:09:18 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 11 Jan 2019 01:09:18 +0000 (UTC) User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) Cc: Michael Albinus , emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 11 02:09:14 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ghlJw-00026o-Rb for ged-emacs-devel@m.gmane.org; Fri, 11 Jan 2019 02:09:12 +0100 Original-Received: from localhost ([127.0.0.1]:45280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghlM3-0001ZZ-K5 for ged-emacs-devel@m.gmane.org; Thu, 10 Jan 2019 20:11:23 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:35077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghlJW-0008Gp-4T for emacs-devel@gnu.org; Thu, 10 Jan 2019 20:08:46 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:51117) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghlFv-0004gx-At; Thu, 10 Jan 2019 20:05:05 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1ghlFv-0001Qz-7C; Thu, 10 Jan 2019 20:05:03 -0500 X-Spook: Toxic Reno Agriculture Israel Crypto AG AQAP Federal X-Ran: m_{u-^.v!-To]`@&bV9*sOhnWp\= (Paul Eggert's message of "Mon, 7 Jan 2019 16:57:41 -0800") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:232303 Archived-At: Paul Eggert wrote: > I've made that mistake myself, and the simplest fix I thought of was > to immediately merge the emacs-26 branch myself to master, making sure > that I handle the mistake correctly during the merge. I think that's the best solution. None of this is a big deal! :)