From mboxrd@z Thu Jan 1 00:00:00 1970 From: Danny Milosavljevic Subject: Re: heads-up: Haskell updates Date: Fri, 16 Feb 2018 16:26:42 +0100 Message-ID: <20180216162642.106e9c7c@scratchpost.org> References: <87r2ppjbst.fsf@elephly.net> <873723pfya.fsf@netris.org> <871shn8jm5.fsf@elephly.net> <87zi4b744f.fsf@elephly.net> <20180214234721.4e9fe198@scratchpost.org> <87a7waodaa.fsf@netris.org> <20180215120404.0a96b628@scratchpost.org> <87fu626yvj.fsf@elephly.net> <20180215180340.52db6ded@scratchpost.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emhuY-0003u6-BS for guix-devel@gnu.org; Fri, 16 Feb 2018 10:26:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emhuU-0006cI-EW for guix-devel@gnu.org; Fri, 16 Feb 2018 10:26:54 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:47452) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1emhuU-0006bW-6V for guix-devel@gnu.org; Fri, 16 Feb 2018 10:26:50 -0500 In-Reply-To: <20180215180340.52db6ded@scratchpost.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: Ricardo Wurmus Cc: guix-devel git am just failed because the index is not matching. So I'll not push my core-updates. Next, I tried git merge origin/master which gave me a number of merge conflicts. One of those is gnu/local.mk: + %D%/packages/patches/gettext-multi-core.patch \ + %D%/packages/patches/gettext-gnulib-multi-core.patch \ These referred files haven't been merged into core-updates by my action above. Why?