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 22:10:59 +0100 Message-ID: <87bm4sgom4.fsf@gmx.de> References: <87ftu4gp4z.fsf@gmx.de> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1546895384 2502 195.159.176.226 (7 Jan 2019 21:09:44 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 7 Jan 2019 21:09:44 +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 22:09:40 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 1ggc9S-0000W0-RM for ged-emacs-devel@m.gmane.org; Mon, 07 Jan 2019 22:09:38 +0100 Original-Received: from localhost ([127.0.0.1]:57305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggcBZ-0004LK-7A for ged-emacs-devel@m.gmane.org; Mon, 07 Jan 2019 16:11:49 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:41321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggcAv-0004KI-GI for emacs-devel@gnu.org; Mon, 07 Jan 2019 16:11:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggcAt-0002eY-Hk for emacs-devel@gnu.org; Mon, 07 Jan 2019 16:11:09 -0500 Original-Received: from mout.gmx.net ([212.227.17.21]:38605) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggcAp-0002SF-U6; Mon, 07 Jan 2019 16:11:05 -0500 Original-Received: from detlef.gmx.de ([212.86.38.160]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MXEs5-1glpLc0SKj-00WBLB; Mon, 07 Jan 2019 22:11:01 +0100 In-Reply-To: <87ftu4gp4z.fsf@gmx.de> (Michael Albinus's message of "Mon, 07 Jan 2019 21:59:40 +0100") X-Provags-ID: V03:K1:iYBoh+fqrrKODuUnJmosoBLSx2ABQqpFQnjwccdEUzD5xqvDcmd r2EnKV5oQ2p1MGH2oA/kdG6zqrV1oWO6cUaTbTwmJx4Hdn5jGXMBvoE3kGRqKHb5GOjX2BD VpNlnaCIV4PzId8bFuFw/ZvX0B6mKiYo/5uz6naqt53Mc+qaTOv+y7E2fg/HBikGGI7gQjF 4Og534pekwjgxfnyD8+Ig== X-UI-Out-Filterresults: notjunk:1;V03:K0:GRivohIsDww=:wDHoN/epzNTp06pHV2aOnq mO3N2ZXET1FEknY0cpxCCzPcY251yb4D7C8aM1ox9TLoZy8oS5cS1VkkzFSHfXeFaKF+ltOU9 4HlhgPs5uLer13gAHCklOHb7XFzgJLgPQIE7kfHY8QnDN2rBMV89SA64z07Z7ZThqoKolaGj1 ui3p0DoPSFZKYjkDY6/BCrK0qWoZcjlhC52t11p9qrEYZvuzRGnbxdq+z3Xzsc9/TDwZlXRRP hn1HZFGr6IPGxEVZwkh9VHhLeUQyGRiQJUXKZB5FKCW08Gwxw8dl50CkvE+eAjABLxt6DPvfj RTVVsGyWVMbc7UEfiXAHryVingzgy1LXTfHEGFMo7f+MA6b3qALT0EWyqmE3RI0yYCDiy2+iP VD7p99Ihmwy3Xde6yFriRogupJAU32PMewGTWXZoRqq5cdIcCKBdbiP+wuptf+EXPCMrnKx1W erpcYoYPuD/uUXH5CAKwEoSLpDr10hH8AZA4g+ABADCuYnPX1HxMpWThAiDMQusYutZXWUEfX zlKA7O/t+euwSvCXzbWidPyiHXC932UtU5gwK28fE0DNpOnQ/h6GVtykYLzGMm9FQxSRgYKoP hHg5ETP3owtTPtFRHX7z7r01suhZVafcsDZq2llzX6z5hMPtVhFJJmimc5pelwLCCLCEwgJsW hphAB9RI2WyTCJqUfNEQnsqwDdNxzobo680eHyade6Xcytk4MRZLsw5UHWMmSEiGtoTh6Kic2 /IXrXvzZc2nYH1nv3x34t/mV7Gehdf4uu7q8QIym9EmKX6dwEsr+c0CIOJsEB0BWumMWSkVm 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:232235 Archived-At: Michael Albinus writes: Hi Glenn, > 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. Maybe it is possible, to ask in the *release-branch*, whether this shall be merged to master. Interactively, when committing. This sole question would be sufficient, at least for me. Best regards, Michael.