From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81060 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.gnus.general Subject: Re: New branch for No Gnus Date: Tue, 31 Jan 2012 20:59:29 +0100 Message-ID: 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 1328039998 14898 80.91.229.3 (31 Jan 2012 19:59:58 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Jan 2012 19:59:58 +0000 (UTC) Cc: Raphael Kubo da Costa , ding@gnus.org To: Lars Ingebrigtsen Original-X-From: ding-owner+M29341@lists.math.uh.edu Tue Jan 31 20:59:56 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 1RsJrw-0006zy-7p for ding-account@gmane.org; Tue, 31 Jan 2012 20:59:56 +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 1RsJrk-00060L-JC; Tue, 31 Jan 2012 13:59:44 -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 1RsJri-000606-Rj for ding@lists.math.uh.edu; Tue, 31 Jan 2012 13:59:42 -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 1RsJrd-0001Il-QQ for ding@lists.math.uh.edu; Tue, 31 Jan 2012 13:59:42 -0600 Original-Received: from mail-out.m-online.net ([212.18.0.9]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RsJrb-0005LC-OQ; Tue, 31 Jan 2012 20:59:35 +0100 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 561BB1C0F568; Tue, 31 Jan 2012 20:59:30 +0100 (CET) X-Auth-Info: GfOopvluwUg1QwtC80/K+N8VEx5OmWKfI8dg//xfDwo= Original-Received: from igel.home (ppp-88-217-120-178.dynamic.mnet-online.de [88.217.120.178]) by mail.mnet-online.de (Postfix) with ESMTPA id 3A3B21C00132; Tue, 31 Jan 2012 20:59:30 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id A998ACA299; Tue, 31 Jan 2012 20:59:29 +0100 (CET) X-Yow: I think I'll make SCRAMBLED EGGS!! They're each in LITTLE SHELLS.. In-Reply-To: <87obtj4sqf.fsf@gnus.org> (Lars Ingebrigtsen's message of "Tue, 31 Jan 2012 19:44:24 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.93 (gnu/linux) X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81060 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.) You will get a merge conflict, which you resolve. $ git merge origin/no-gnus Auto-merging texi/message.texi CONFLICT (content): Merge conflict in texi/message.texi Auto-merging texi/gnus.texi CONFLICT (content): Merge conflict in texi/gnus.texi Auto-merging lisp/gnus.el CONFLICT (content): Merge conflict in lisp/gnus.el Auto-merging lisp/ChangeLog Recorded preimage for 'lisp/gnus.el' Recorded preimage for 'texi/gnus.texi' Recorded preimage for 'texi/message.texi' Automatic merge failed; fix conflicts and then commit the result. The messages about recording preimage are part of the rerere support. There is no conflict report for lisp/ChangeLog since I have set up git-merge-changelog. Use git reset --merge to abort a failed merge. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."