From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Enge Subject: Re: =?utf-8?B?4oCYY29yZS11cGRhdGVz?= =?utf-8?B?4oCZ?= merge is a squashed commit Date: Thu, 4 Aug 2016 10:24:00 +0200 Message-ID: <20160804082400.GA1638@solar> References: <20160802174821.GA29590@jasmine> <874m7297xg.fsf@gnu.org> <20160803040446.GA23535@jasmine> <871t253ith.fsf@gnu.org> <20160803172417.GA10236@jasmine> <878twd20ui.fsf@gnu.org> <20160803183911.GC11621@jasmine> <87wpjxy4ta.fsf_-_@gnu.org> <20160803211032.GA6034@jasmine> <87a8gtyntw.fsf@netris.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVDwo-0000e3-2D for guix-devel@gnu.org; Thu, 04 Aug 2016 04:24:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVDwi-0004ij-Ly for guix-devel@gnu.org; Thu, 04 Aug 2016 04:24:09 -0400 Received: from mailrelay6.public.one.com ([91.198.169.200]:50195) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVDwi-0004iY-8h for guix-devel@gnu.org; Thu, 04 Aug 2016 04:24:04 -0400 Content-Disposition: inline In-Reply-To: <87a8gtyntw.fsf@netris.org> 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: Mark H Weaver Cc: guix-devel@gnu.org On Thu, Aug 04, 2016 at 03:50:51AM -0400, Mark H Weaver wrote: > How about reverting the squashed commit and then re-doing a proper merge > from 'core-updates-2016-08-01' into 'master'? If this is possible without too many complications, that sounds like a good option; the earlier the better, probably, before there are too many new conflicts. Hm, I just tried the revert part, and it already creates a conflict. Andreas