From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2] Date: Sun, 03 Apr 2016 23:15:34 +0200 Message-ID: <87pou6xukp.fsf@linux-m68k.org> References: <56FE1882.9030904@cs.ucla.edu> <20160403120300.GB3537@acm.fritz.box> <8760vy6gfi.fsf@Rainer.invalid> <871t6m5zjq.fsf@Rainer.invalid> <87wpoey1ij.fsf@linux-m68k.org> <570176DF.1060207@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1459718151 14048 80.91.229.3 (3 Apr 2016 21:15:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 21:15:51 +0000 (UTC) Cc: emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 03 23:15:46 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ampN4-0007fX-Cm for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 23:15:46 +0200 Original-Received: from localhost ([::1]:55271 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ampN3-0002H8-MN for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 17:15:45 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ampMz-0002D5-72 for emacs-devel@gnu.org; Sun, 03 Apr 2016 17:15:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ampMw-0002Yx-0k for emacs-devel@gnu.org; Sun, 03 Apr 2016 17:15:41 -0400 Original-Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:36425) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ampMv-0002Yl-JK for emacs-devel@gnu.org; Sun, 03 Apr 2016 17:15:37 -0400 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3qdSZc0vbdz3hjcW; Sun, 3 Apr 2016 23:15:35 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3qdSZb67t6zvh1s; Sun, 3 Apr 2016 23:15:35 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id 9fmgY6QlIu8K; Sun, 3 Apr 2016 23:15:35 +0200 (CEST) X-Auth-Info: FFpyD2bEr8szTmF/cGQcm5QUPYDF6FkcQoibc5V5YrhjChde911ibc5M6byq+cdT Original-Received: from igel.home (ppp-88-217-22-197.dynamic.mnet-online.de [88.217.22.197]) by mail.mnet-online.de (Postfix) with ESMTPA; Sun, 3 Apr 2016 23:15:35 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 1000) id B22422C36E0; Sun, 3 Apr 2016 23:15:34 +0200 (CEST) X-Yow: Hiccuping & trembling into the WASTE DUMPS of New Jersey like some drunken CABBAGE PATCH DOLL, coughing in line at FIORUCCI'S!! In-Reply-To: <570176DF.1060207@cs.ucla.edu> (Paul Eggert's message of "Sun, 3 Apr 2016 13:02:39 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.92 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2001:a60:0:28:0:1:25:1 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:202650 Archived-At: Paul Eggert writes: > Rebasing makes sense for Alan's use case. He was working on the fix > anyway, so retesting was not that big a deal for him. Conversely, he's > more of an Emacs expert than a Git expert and merge conflicts are more of > an hassle for him. If you get a merge conflict then you also get rebase conflicts. > As one becomes more of a Git expert, merging becomes more attractive. It > does take some getting used to, though. Merging is much easier to handle. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."