From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: heads-up: Haskell updates Date: Thu, 15 Feb 2018 12:46:14 -0500 Message-ID: <20180215174614.GA31223@jasmine.lan> 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: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="DocE+STaALJfprDB" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52995) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emNbz-0007Ca-81 for guix-devel@gnu.org; Thu, 15 Feb 2018 12:46:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emNbu-00062m-C8 for guix-devel@gnu.org; Thu, 15 Feb 2018 12:46:23 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:49555) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1emNbu-000621-4G for guix-devel@gnu.org; Thu, 15 Feb 2018 12:46:18 -0500 Content-Disposition: inline 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: Danny Milosavljevic Cc: guix-devel --DocE+STaALJfprDB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Feb 15, 2018 at 06:03:56PM +0100, Danny Milosavljevic wrote: > Hi Ricardo, >=20 > > Danny, could you please do this on master and core-updates? >=20 > I've done it on master now. >=20 > Maybe it's me being used to SVN, but can I git am the commit to core-upda= tes? >=20 > Wouldn't that cause a conflict on the next merge of master to core-update= s (because of the missing in-betweens) ? Git handles this case in my experience. If you try it and it becomes complicated, you could instead merge master into core-updates in order to get the change on core-updates. If you're not comfortable doing it with Git just let me know and I'll do it. --DocE+STaALJfprDB Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlqFx2MACgkQJkb6MLrK fwhQtg/6AnKol+K31McKMqXd4wTX/HMy9i7tFkmQOBac/2AQuZWMLeDl8lzdB1Oy jtlVj+QAEBrhrpMwOnS73KC8tLiGp+S/oymb2xIg2VMXyLOIg3hAMOf8e6WZXiX4 Rhc0J0Ecr6gX34kLQMwfLvvsfAM8jQYT0vosVKshtkBM9TxR2tvmqk1yXQL5g769 WsC9RT9zCuf3sttT9cRJoYnkRvFQyR7DR+zNmNKFp3TGYChIxdfdKI87esN3UCqL Fpbp12OtVXvnZJR+0JRPlRRPIzt032iykux/1lJ+cgQniMNmiuk3kR3nHjA7dQDY OdJCh79HKXQVJmJ0lCH60D7aYhhs6yfRP74IhmO6bUBQhKBOsju7JGjvINudsick CG+m9Q1jFEKfgs6DXT7wrdt5iTx/ijwCvUSZBvrrUZ4AZ4un5cMh+al40o7QwDhi fp7GlvhYaQ4rMJh/CncWyWO4FHZJ4YcdMVUA1Y/mr0BNuTGTl6/Df+tpKMHXb35z 743ZPKG/hiEixdJysbSVXH7jPCybdjIW8wCnJ83+CXZ/hbkDxZdPiLB/aEC4TOnk HIPurjwYaBKuM/dXMeRPtEvolDTz2LuaIWek5Qy/upgYMZ6FMZ3Y23K/PzLZFCPx Hee7tdYVwx0K7J6jOx+OiUU6A/Pv3eLI/R3hUEEHGh480xk0St8= =5A9D -----END PGP SIGNATURE----- --DocE+STaALJfprDB--