From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Artur Malabarba Newsgroups: gmane.emacs.devel Subject: Re: Suggestion to enable git rerere by default Date: Tue, 10 Nov 2015 11:12:49 +0000 Message-ID: <87lha6cdla.fsf@gmail.com> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1447150452 32665 80.91.229.3 (10 Nov 2015 10:14:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 10 Nov 2015 10:14:12 +0000 (UTC) Cc: =?utf-8?Q?Aur=C3=A9lien?= Aptel , Emacs development discussions To: Nicolas Richard Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 10 11:14:05 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 1Zw5wA-0003wE-Ob for ged-emacs-devel@m.gmane.org; Tue, 10 Nov 2015 11:14:02 +0100 Original-Received: from localhost ([::1]:58615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw5wA-0001SR-9w for ged-emacs-devel@m.gmane.org; Tue, 10 Nov 2015 05:14:02 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw5vm-0001Pg-KI for emacs-devel@gnu.org; Tue, 10 Nov 2015 05:13:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zw5vj-0000WX-8R for emacs-devel@gnu.org; Tue, 10 Nov 2015 05:13:38 -0500 Original-Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:34485) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw5vj-0000WN-1R for emacs-devel@gnu.org; Tue, 10 Nov 2015 05:13:35 -0500 Original-Received: by wmnn186 with SMTP id n186so150519259wmn.1 for ; Tue, 10 Nov 2015 02:13:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type:content-transfer-encoding; bh=QYJEdEZdX75zsZsrr1hlpbOf7Z58QC/AvRm96j7JDwQ=; b=DYJhzKAmN3IllZVSTzTFAJnJSK5q7QdjSg8ucHTp6XaAfO4FC5ETjk6CiFSGYGlAXM zrk3hfdN9wIQdGqOhxJJfWdY5u/GGHrfMCeoj/JprLzHLZfdp/mbfKBwLELCkisObo3C vjTnS7AWI5IxYf4gGfG4hUEuoohlC/FyICwRI6jtF9oazBBQ2tmT4g+XNkXpgY+N3wW8 TA7Od/9VIgJ5p6Ddik0+Yg2jVwFyAXvxhVzNGWJqGcGHniyMjbGiu0ASCsvuyEJhRzdq 0RsR1NaIhobwP1brROs0fTJdjoPt7ch7cWy+CUcTcS38LXhxOy+SjTwVBhK5HaGvdAtS imig== X-Received: by 10.28.48.10 with SMTP id w10mr7923728wmw.39.1447150414361; Tue, 10 Nov 2015 02:13:34 -0800 (PST) Original-Received: from Gandalf-Linux.gmail.com (host-92-12-87-116.as43234.net. [92.12.87.116]) by smtp.gmail.com with ESMTPSA id q1sm2640153wjy.31.2015.11.10.02.13.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Nov 2015 02:13:32 -0800 (PST) In-Reply-To: <87io5a19jy.fsf_-_@members.fsf.org> (Nicolas Richard's message of "Tue, 10 Nov 2015 10:35:29 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c09::22f 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:193832 Archived-At: Nicolas Richard writes: > Aur=C3=A9lien Aptel writes: >> made any subsequent master merge a lot harder, sorry for that. The >> weird thing is most conflicting changes where actually identical but >> git couldn't tell. The diff were the same on both side but git couldnt >> tell they were from the same commits since they were squashed. > > ...did you enable git rerere ? (you can check with: git config --get > rerere.enabled). If not, I suggest that you do it: > git config --global rerere.enabled 1 I had never heard about it. If it's really as nice as it sounds (no drawbacks?), lets add this recommendation. > modified admin/notes/git-workflow > @@ -124,6 +124,11 @@ the resulting merge, but if you really want to, feel= free to do that. > Note you can also resume gitmerge in a new Emacs session, since the > current state will be saved to disk. >=20=20 > +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: =E2=80=9Cif you're go= ing to merge master onto the same (long-lived) feature branch multiple times=E2=80=9D?