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 1RZXOd-0006Jq-A2 for garchives@archives.gentoo.org; Sun, 11 Dec 2011 00:36:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DF9721C078; Sun, 11 Dec 2011 00:35:51 +0000 (UTC) Received: from foo.stuge.se (foo.stuge.se [212.116.89.98]) by pigeon.gentoo.org (Postfix) with SMTP id C801821C078 for ; Sun, 11 Dec 2011 00:35:50 +0000 (UTC) Received: (qmail 21707 invoked by uid 501); 11 Dec 2011 00:35:48 -0000 Message-ID: <20111211003548.21706.qmail@stuge.se> Date: Sun, 11 Dec 2011 01:35:48 +0100 From: Peter Stuge To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] rfc: merging catalyst git branches Mail-Followup-To: gentoo-catalyst@lists.gentoo.org References: <20110627044433.GA9772@linux1> <20111208194623.GA2416@linux1> <4EE16A9A.4090609@gentoo.org> <20111209031956.GA11180@linux1> <4EE1919B.5000308@gentoo.org> <20111209161625.GA5998@linux1> <4EE25814.1000308@gentoo.org> <20111210144531.GA3616@linux1> <4EE3DA15.4060307@gentoo.org> 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 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4EE3DA15.4060307@gentoo.org> X-Archives-Salt: e0e9fbf3-f3d0-454b-9c4b-5b1b4f835b7b X-Archives-Hash: ded643aa70a90820f2d4e4c2aec1cc30 Sebastian Pipping wrote: > > 3) put the code on catalyst_2 on master. > > > > What about this? > > Either git commit-tree or forced push. git commit-tree is the better way. Sometimes it is neccessary to rewrite public history, but this is not one of those times. Whenever it is not absolutely neccessary, it's better to do something else on the branch than rewrite it - unless the branch is well known to be rewritten (like a testing branch might be). catalyst master is not a testing branch and shouldn't be rewritten. William, please go with Sebastian's suggestion. //Peter