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, 14 Jan 2019 17:39:23 +0100 Message-ID: <87k1j7i478.fsf@gmx.de> References: <87ftu4gp4z.fsf@gmx.de> <87bm4sgom4.fsf@gmx.de> <8n5zuw57gn.fsf@fencepost.gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1547484018 31437 195.159.176.226 (14 Jan 2019 16:40:18 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 14 Jan 2019 16:40:18 +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 14 17:40:13 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 1gj5HZ-00082X-D6 for ged-emacs-devel@m.gmane.org; Mon, 14 Jan 2019 17:40:13 +0100 Original-Received: from localhost ([127.0.0.1]:42378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj5Jg-0008LW-6T for ged-emacs-devel@m.gmane.org; Mon, 14 Jan 2019 11:42:24 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:34272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj5H6-0006OH-7O for emacs-devel@gnu.org; Mon, 14 Jan 2019 11:39:44 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj5H4-00051I-85 for emacs-devel@gnu.org; Mon, 14 Jan 2019 11:39:43 -0500 Original-Received: from mout.gmx.net ([212.227.17.21]:59629) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj5H3-0004va-Ti; Mon, 14 Jan 2019 11:39:42 -0500 Original-Received: from detlef.gmx.de ([212.86.43.239]) by mail.gmx.com (mrgmx103 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Lcjdr-1h92Lq1V0p-00k6VO; Mon, 14 Jan 2019 17:39:25 +0100 In-Reply-To: <8n5zuw57gn.fsf@fencepost.gnu.org> (Glenn Morris's message of "Thu, 10 Jan 2019 20:06:00 -0500") X-Provags-ID: V03:K1:UFDZ8x3yJYCsis357NBT4f6Xm9D5io+inA8J1ez0F9Z23JA5ccm 7HsO7YnATMISePRQrlf7kc8S6KDHpxXJvZm+dqIBJIYQ4o5rcYnG+IZv6wuzyvPLrWG/NCI omvxqNqtJYYqk4YHDXo6RoJqWqivPTbJS/dYkPTJ9yZ1CWCCfTx6DVRtrD+T1aEQjysn+CC vjBcTbmIDWRePPZpSLFpA== X-UI-Out-Filterresults: notjunk:1;V03:K0:+wvt3YK+7U8=:eff1K2Td5t/MUMbQeFMk+K OKGPCoXVd6ksWj+VO1Vh0SriL+8TdGdGFhCh5dktdt+3twIug1ze6ThWg6nvYoyb6HTx6ZhgK NV+yQW3e1d6XUrv3lZvqdq09mKZ1EP/8+OOwNCBNMFw0oYrwalhnmVZNTgKsySnNAm6hfhmuM HMEXyr/B2HPhSfczJLN5HW9ASFqibZ8QHESu+RW7drFRwBxJaLH704ZhQFD/4mxHXJzas7Fyc gW7jETwvNsRRgstCkiggly/KLyvZ7hhUlEA3zBnCkhYc2wsbPtW2KVrvRBKv1z48Lp1lsgqq3 CUbIRX8ex0mXoFwOB7a9Gba4QRj+ZPJZRxd0eZK0bn8Hh2ok6iI8lQVEOoJaRfrCmM27x5SbO jFMLG4utgBs//VGyzVzydPlBR91ne7bpIPxgISg0/1HJHvc6jXDu90fa6m9xMicWbJnjy94WN IaALyzZrDxV/sVy93/N2pCyd49l2bmdGAXLSqf5tkbsiAvlmTvuMX2bYJ4M07HchI4D/TGwz9 54sH5QvZKseFAxcqPsgoy06PNZ/ZCdT94hFvAtPJcVaXj/Zx3XaQn9pHTo4VNRjl84aAEHelK mho970EuRZCDn+vtWNVwnx0/nfA7zwt+iS8oh1uuxgRphO/Q111W0tRoilXyBO+EwHHQbhaKH fqV3Q8HeL6H9w6NbX4Y63Wc5iFoclHTGfV6Ob1/WVCQ3uMGZt82X4uiLFMcG9kVM/kslfkff9 jVN8sc5XDnIBlwQftaDBkw/yP7OpJlN0R4ENdS6tYS+Nxtu0jl7/JMHe4N/Iq+CKH7oH7hsS 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:232341 Archived-At: Glenn Morris writes: > Michael Albinus wrote: > >> 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. > > Maybe that is a check you could implement locally for your use, but I > really wouldn't worry about it. I've ended up in a private function for `vc-before-checkin-hook'. Best regards, Michael.