From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81056 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 16:52:28 -0200 Message-ID: <87ty3bln6b.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328035980 16675 80.91.229.3 (31 Jan 2012 18:53:00 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Jan 2012 18:53:00 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M29337@lists.math.uh.edu Tue Jan 31 19:53:00 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 1RsIp9-0002UB-7p for ding-account@gmane.org; Tue, 31 Jan 2012 19:52:59 +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 1RsIp2-0005ac-1f; Tue, 31 Jan 2012 12:52:52 -0600 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1RsIp0-0005aN-Td for ding@lists.math.uh.edu; Tue, 31 Jan 2012 12:52:50 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1RsIow-00010z-Ff for ding@lists.math.uh.edu; Tue, 31 Jan 2012 12:52:50 -0600 Original-Received: from plane.gmane.org ([80.91.229.3]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RsIot-0003mB-JV for ding@gnus.org; Tue, 31 Jan 2012 19:52:43 +0100 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1RsIop-0002ML-BI for ding@gnus.org; Tue, 31 Jan 2012 19:52:39 +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 19:52:39 +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 19:52:39 +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:3QzjeEQKrhya1RedonFuTzpPCKs= X-Spam-Score: -0.7 (/) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81056 Archived-At: Lars Ingebrigtsen writes: > So I should just merge, and then delete all the stuff that Git put into > Ma Gnus from No Gnus? (I mean, right now. None of the changes to No > Gnus, which are just version numbers, apply to Ma Gnus.) 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. > And then after doing that, then all further changes will just apply > nicely? I mean, if I then do an actual bug fix in No Gnus, and then > merge that into Ma Gnus? That'd be nice. :-) That's the idea ;)