From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.devel Subject: Re: merge conflict tedium Date: Mon, 07 Jan 2019 21:59:40 +0100 Message-ID: <87ftu4gp4z.fsf@gmx.de> References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1546894670 11935 195.159.176.226 (7 Jan 2019 20:57:50 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 7 Jan 2019 20:57:50 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 07 21:57:45 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 1ggbxv-0002wh-GD for ged-emacs-devel@m.gmane.org; Mon, 07 Jan 2019 21:57:43 +0100 Original-Received: from localhost ([127.0.0.1]:54234 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggc02-0007MB-7j for ged-emacs-devel@m.gmane.org; Mon, 07 Jan 2019 15:59:54 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:37502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggbzv-0007L8-D2 for emacs-devel@gnu.org; Mon, 07 Jan 2019 15:59:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggbzu-0002Bq-N2 for emacs-devel@gnu.org; Mon, 07 Jan 2019 15:59:47 -0500 Original-Received: from mout.gmx.net ([212.227.17.21]:41099) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggbzu-0002AE-Dx; Mon, 07 Jan 2019 15:59:46 -0500 Original-Received: from detlef.gmx.de ([212.86.38.160]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MRjd7-1grMRQ2vyD-00StVR; Mon, 07 Jan 2019 21:59:41 +0100 In-Reply-To: (Glenn Morris's message of "Mon, 07 Jan 2019 15:00:34 -0500") X-Provags-ID: V03:K1:8ZfGXXSUXQccAQx6BqR3GGPYsF7t9VT+J6dUafZcQwtzBJ6gP3r ooFVL1w+tCOjANK0u/jq4I/Y0zr4sY95n0Efp/rtU52BAortwFvRNMsrcC9hxeegrfNpjtq iIGWmtEDH52tDb2OJrIPqmuWMzwQLI07FS6CTh6pehGxowN0mGjP4GTK6jg7Bus9CbRHt8G CH90WkqYNvUz81vEanjZQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:VHYFrCsV8M4=:Hx6q732UfLcgffczbYy/5f 8GgCoPaRWkh1jY9teZrY06HAOBlUYSydKamajFVm9bPqvkQkiSk624FCeDx5VYf87o+n6sXdl y/UsZ4TXy91ytILmcIG7hTXrjeGRrAzT5dpHWEYIZD2xCcN0SCRAqELUPQTzksH8WSGQhW7fo 6zf8c69cj1+sbAamcodlmKvg/x2cJrMZ4a8mpyovZ7b2Duj3CWnxz/TG0tSGcp2j1Upn+RLcp DeTmFOIYjhbC8kP6ssT8KCqkV9Gd9EJDIxylwDEr3nnwVpMAh+2Y10Ut5vzcyl0w22XdFSJd3 3h53TmdkpGNuHIXtqhWS68L3ska3bcgWfGAliNYewpZXOadZGlBxDF6QDXlHXRQabzV+iaFG0 jQhIHHlg0O1JjMUZksGoI0ZurQsoTXVF1mdVZowhgMIbpItLZgwRCNBnY2nTB0KlsWq7TmYLA MarR9ftGMwIxIMhX0uHuZhSzRj9utBjCLyEFhLwmKhzhL/JSaNHwqDSVTl0fdLnnwzETXeBR9 LU4jmEjFfTa2aTDW/Z2UOIjdPFeI1E5Vrf/whVPpKzrXIyz+okc0sb2KsPdVegz0EEp0Hhw9u 2pQsE7c0SeC7uUiPTQdcdf5XB50IkogI8IoRTiBnBt/Nm+g6TkGg4rSPuAZk0uWMX/Fjju1+8 zdp+CTMvWL2npe9AcWrZAt/nv1cXMmFRtUsCK2XZLl9atUis00U5m4qIs33O9jS+DXHTT3xwM AO6hEa2PlKbKBDazckdI+s7jm18lG0cvYq7U6+ebIbpExWd5T60RBEP+7Mu0J2HN9KUYJHSn X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.21 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:232233 Archived-At: Glenn Morris writes: > Hi, Hi Glenn, > Today's problems were caused by: > 1) 08840f2 > 2) 536e6de and 13b586d, and b513feb All of these commits are mine, and I'm very sorry for that. It happens again and again that I forget the "don't merge" idiom in the commit message, and even if I recognize it after the commit (it happens), I don't know how to add it after a push. Is there something I could do? > Conceptually the same commit (?), but made on different branches without > any indication, coupled with a simultaneous reformat on master. Changing > the same code on multiple branches at the same time is a PITA. Please > merge it yourself if doing that. It is not intended to be merged. After the crewation of Emacs 26.1.91, I've seen on emba, that the code I've resolved in the morning in the master branch, needed to be adapted also in the emacs-26 branch. A cherry pick wasn't possible, so the looks-like-identical merge. Again, I forgot to say "don't merge". Do we have any other mean, to handle such situations? The current workflow requires to add the proper wording during commit. I cannot promise this will always work, so some more robust approach would be welcome. > End of complaint! :) You have all rights to complain! I'm very sorry about. Best regards, Michael.