From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RYl6b-0003x3-CT for garchives@archives.gentoo.org; Thu, 08 Dec 2011 21:02:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC26621C1CA for ; Thu, 8 Dec 2011 21:02:12 +0000 (UTC) Received: from smtprelay02.ispgateway.de (smtprelay02.ispgateway.de [80.67.18.14]) by pigeon.gentoo.org (Postfix) with ESMTP id 15AC721C066 for ; Thu, 8 Dec 2011 20:31:41 +0000 (UTC) Received: from [85.179.18.203] (helo=[192.168.1.2]) by smtprelay02.ispgateway.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1RYkd1-0005kL-QZ for gentoo-catalyst@lists.gentoo.org; Thu, 08 Dec 2011 21:31:39 +0100 Message-ID: <4EE11E9E.4000809@gentoo.org> Date: Thu, 08 Dec 2011 21:31:26 +0100 From: Sebastian Pipping User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:8.0) Gecko/20111118 Thunderbird/8.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org MIME-Version: 1.0 To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] rfc: merging catalyst git branches References: <20110627044433.GA9772@linux1> <20111208194623.GA2416@linux1> In-Reply-To: <20111208194623.GA2416@linux1> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Df-Sender: c3BpbmctZ2VudG9vQGJpbmVyYS5kZQ== X-Archives-Salt: a2bb354d-432a-4f7d-861b-291205aaf678 X-Archives-Hash: 2f49ad3b39c005a6ee3175089aaa8d9a On 12/08/2011 08:46 PM, William Hubbs wrote: >> [..] >> >> If we are not interested in the 3.0 code, we should probably find a way >> to revert all of it from master with one commit then rebase the 2.0 >> branch on master and move it back there. > > If no one objects, I will look into doing this next week; the catalyst_2 > code should move to master since there doesn't appear to be any work > going on for releasing catalyst 3. > > Comments? Sounds like you are going for complete replacement. Good move. The cleanest way to do this this in Git may be: # git checkout master # git merge -s theirs catalyst_2 Haven't tested it though. Best, Sebastian