From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: Rebasing core-updates-next branch Date: Tue, 12 Jul 2016 18:29:27 -0400 Message-ID: <20160712222927.GB2056@jasmine> References: <9cd9387c-589d-5bc2-475b-d12fd6c10ff5@gmail.com> <87zipnnwkx.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bN6BR-00020C-84 for guix-devel@gnu.org; Tue, 12 Jul 2016 18:29:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bN6BO-0004CQ-1Z for guix-devel@gnu.org; Tue, 12 Jul 2016 18:29:41 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:33743) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bN6BM-0004Bd-R5 for guix-devel@gnu.org; Tue, 12 Jul 2016 18:29:37 -0400 Content-Disposition: inline In-Reply-To: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Manolis Ragkousis Cc: guix-devel@gnu.org, Alex Kost On Tue, Jul 12, 2016 at 03:57:34PM +0300, Manolis Ragkousis wrote: > On 07/12/16 09:04, Ricardo Wurmus wrote: > > Do we need to rebase? Is a merge not possible? > > It's definitely possible but I agree with Ludo on this. It's better to > avoid unnecessary merge commits. Merges *are* ugly but, in general, I think they are better than discarding the signatures.