From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81057 Path: news.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.gnus.general Subject: Re: New branch for No Gnus Date: Tue, 31 Jan 2012 19:58:13 +0100 Message-ID: <87fwev4s3e.fsf@gnus.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328036316 19160 80.91.229.3 (31 Jan 2012 18:58:36 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Jan 2012 18:58:36 +0000 (UTC) Cc: ding@gnus.org To: Raphael Kubo da Costa Original-X-From: ding-owner+M29338@lists.math.uh.edu Tue Jan 31 19:58:35 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 1RsIuT-0004q4-LP for ding-account@gmane.org; Tue, 31 Jan 2012 19:58:29 +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 1RsIuO-0005eG-D8; Tue, 31 Jan 2012 12:58:24 -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 1RsIuN-0005e7-DV for ding@lists.math.uh.edu; Tue, 31 Jan 2012 12:58:23 -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 1RsIuM-0007on-Gw for ding@lists.math.uh.edu; Tue, 31 Jan 2012 12:58:23 -0600 Original-Received: from hermes.netfonds.no ([80.91.224.195]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RsIuL-0003uZ-36 for ding@gnus.org; Tue, 31 Jan 2012 19:58:21 +0100 Original-Received: from 93-41-188-50.ip82.fastwebnet.it ([93.41.188.50] helo=rusty) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1RsIuF-0001s0-Gz; Tue, 31 Jan 2012 19:58:15 +0100 In-Reply-To: <87ty3bln6b.fsf@FreeBSD.org> (Raphael Kubo da Costa's message of "Tue, 31 Jan 2012 16:52:28 -0200") User-Agent: Gnus/5.130002 (Ma Gnus v0.2) Emacs/24.0.92 (gnu/linux) X-MailScanner-ID: 1RsIuF-0001s0-Gz MailScanner-NULL-Check: 1328641095.75924@hxG8pQnu7r1ei4k18jsplA X-Spam-Status: No X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81057 Archived-At: 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"? -- (domestic pets only, the antidote for overdose, milk.) http://lars.ingebrigtsen.no * Sent from my Rome