From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Nicolas Richard Newsgroups: gmane.emacs.devel Subject: Re: Suggestion to enable git rerere by default Date: Tue, 10 Nov 2015 14:01:31 +0100 Message-ID: <8637weqale.fsf@members.fsf.org> References: <871tc315y3.fsf@lifelogs.com> <83611eqk9w.fsf@gnu.org> <878u6ax7c7.fsf@lifelogs.com> <83k2ptq5t3.fsf@gnu.org> <87h9kxx60e.fsf@lifelogs.com> <877flswse5.fsf@lifelogs.com> <8737wgw7kf.fsf@lifelogs.com> <87io5a19jy.fsf_-_@members.fsf.org> <87lha6cdla.fsf@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1447160556 4340 80.91.229.3 (10 Nov 2015 13:02:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 10 Nov 2015 13:02:36 +0000 (UTC) Cc: =?utf-8?Q?Aur=C3=A9lien?= Aptel , Emacs development discussions To: Artur Malabarba Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 10 14:02:26 2015 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 1Zw8Z2-000581-SK for ged-emacs-devel@m.gmane.org; Tue, 10 Nov 2015 14:02:21 +0100 Original-Received: from localhost ([::1]:59602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw8Z2-0002mg-Hg for ged-emacs-devel@m.gmane.org; Tue, 10 Nov 2015 08:02:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw8Ya-0002m2-5B for emacs-devel@gnu.org; Tue, 10 Nov 2015 08:02:01 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zw8YW-00018D-UF for emacs-devel@gnu.org; Tue, 10 Nov 2015 08:01:52 -0500 Original-Received: from mxin.ulb.ac.be ([164.15.128.112]:13814) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw8YW-000188-OX for emacs-devel@gnu.org; Tue, 10 Nov 2015 08:01:48 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Al4IAGvpQVakD4XH/2dsb2JhbABehA5wq0ABAQEBAQEGlGojhW0CggcBAQEBAQGBC0ETAYNhAQEDASMPAUYFCwgDDgwCBSECAg8BRwaIOQgNsXCQXAEBCAIhgQGFDIVFhCmDTIFEBZZIhR2KLYZpkzhjhAU9ghSDTgEBAQ Original-Received: from pno-math-199.ulb.ac.be (HELO Aurora) ([164.15.133.199]) by smtp.ulb.ac.be with ESMTP; 10 Nov 2015 14:01:32 +0100 User-agent: mu4e 0.9.15; emacs 25.0.50.2 In-reply-to: <87lha6cdla.fsf@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 164.15.128.112 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:193844 Archived-At: > I had never heard about it. If it's really as nice as it sounds (no > drawbacks?), lets add this recommendation. Here's what I found on the potential drawbacks: http://stackoverflow.com/questions/5519244/are-there-any-downsides-to-enabling-git-rerere IIUC the main problem is rerere might resolve conflicts that textually look the same but were semantically different Note that when rerere does its work, it leaves no conflict markers but the changes are still left uncommitted and you can review them. > > +The following is helpful if you're going to merge the same set of > > +changes multiple times : > This sounds strange to me. Would it be better to say: “if you're going > to merge master onto the same (long-lived) feature branch multiple > times”? I'll trust you. I'm 100% not english native. Nicolas