From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81058 Path: news.gmane.org!not-for-mail From: Raphael Kubo da Costa Newsgroups: gmane.emacs.gnus.general Subject: Re: New branch for No Gnus Date: Tue, 31 Jan 2012 17:15:18 -0200 Message-ID: <87pqdzlm49.fsf@FreeBSD.org> References: <87bopnvezm.fsf@gnus.org> <87k44bh84h.fsf@dod.no> <87aa55cctr.fsf@gnus.org> <87aa54riih.fsf@dod.no> <87bopkc0dq.fsf@gnus.org> <87hazb26fm.fsf@dod.no> <87ty3b6c0d.fsf@gnus.org> <87y5snlnwz.fsf@FreeBSD.org> <87obtj4sqf.fsf@gnus.org> <87ty3bln6b.fsf@FreeBSD.org> <87fwev4s3e.fsf@gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328037359 27387 80.91.229.3 (31 Jan 2012 19:15:59 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Jan 2012 19:15:59 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M29339@lists.math.uh.edu Tue Jan 31 20:15:59 2012 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RsJBO-0004G5-8b for ding-account@gmane.org; Tue, 31 Jan 2012 20:15:58 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1RsJB7-0005ko-T3; Tue, 31 Jan 2012 13:15:41 -0600 Original-Received: from mx1.math.uh.edu ([129.7.128.32]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1RsJB6-0005kc-AD for ding@lists.math.uh.edu; Tue, 31 Jan 2012 13:15:40 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1RsJB2-0007t0-7o for ding@lists.math.uh.edu; Tue, 31 Jan 2012 13:15:40 -0600 Original-Received: from plane.gmane.org ([80.91.229.3]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RsJB0-0004K3-Q2 for ding@gnus.org; Tue, 31 Jan 2012 20:15:34 +0100 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1RsJAx-00044G-EZ for ding@gnus.org; Tue, 31 Jan 2012 20:15:31 +0100 Original-Received: from 201.82.194.83 ([201.82.194.83]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 31 Jan 2012 20:15:31 +0100 Original-Received: from rakuco by 201.82.194.83 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 31 Jan 2012 20:15:31 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 16 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 201.82.194.83 User-Agent: Gnus/5.130002 (Ma Gnus v0.2) Emacs/24.0.90 (berkeley-unix) Cancel-Lock: sha1:w86Kel5vYdAfq+kKyMb1/V+L+G4= X-Spam-Score: -0.7 (/) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81058 Archived-At: Lars Ingebrigtsen writes: > Raphael Kubo da Costa writes: > >> Yes. Depending on how much free time you have these days, you might also >> want to take a look at git merge's different merge strategies, and also >> the `git rerere' command, which records conflict resolutions for the >> future. > > Do I need the "git rerere" if I never do a "git reset"? I don't think I've fully understood the question; both commands seem orthogonal to me. Progit [1] will probably make more sense than anything I say :) [1] http://progit.org/2010/03/08/rerere.html