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: merge conflict tedium Date: Mon, 07 Jan 2019 15:00:34 -0500 Message-ID: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1546891122 31455 195.159.176.226 (7 Jan 2019 19:58:42 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 7 Jan 2019 19:58:42 +0000 (UTC) User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 07 20:58:38 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 1ggb2j-00082H-6Z for ged-emacs-devel@m.gmane.org; Mon, 07 Jan 2019 20:58:37 +0100 Original-Received: from localhost ([127.0.0.1]:38817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggb4q-0000eS-4w for ged-emacs-devel@m.gmane.org; Mon, 07 Jan 2019 15:00:48 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:43710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggb4i-0000dY-FZ for emacs-devel@gnu.org; Mon, 07 Jan 2019 15:00:41 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggb4g-0000ms-BR for emacs-devel@gnu.org; Mon, 07 Jan 2019 15:00:40 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:46635) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggb4f-0000l1-So for emacs-devel@gnu.org; Mon, 07 Jan 2019 15:00:38 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1ggb4d-00071u-Ju; Mon, 07 Jan 2019 15:00:36 -0500 X-Spook: SBI rail gun Mafia TTP FARC Cops SSL Fort Hancock X-Ran: _0kpWYz9]TiiBR7VzA9RoU2vp)K5!!d?FVh@I+.,$A;T}K>NzcWycPtr6 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:232230 Archived-At: Hi, I have set up automatic merging of the emacs-26 branch to master some time ago. I feel like I quite often have to intervene due to needless merge conflicts that can't be resolved automatically but could have been avoided with a little effort. Today's problems were caused by: 1) 08840f2 Unlabelled backport of a year old commit from master? Adding an explicit "backport" or "cherry-pick" message to the commit would have avoided this. 2) 536e6de and 13b586d, and b513feb 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. End of complaint! :)