From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: btrfs-progs updated to 4.8.2 twice Date: Mon, 31 Oct 2016 13:56:42 -0400 Message-ID: <20161031175642.GD27555@jasmine> References: <20161028021706.GA4285@jasmine> <87lgx5se4n.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c1GpD-0003e1-Nb for guix-devel@gnu.org; Mon, 31 Oct 2016 13:56:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c1GpA-0000DY-Kg for guix-devel@gnu.org; Mon, 31 Oct 2016 13:56:47 -0400 Content-Disposition: inline In-Reply-To: <87lgx5se4n.fsf@gnu.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: Ludovic =?iso-8859-1?Q?Court=E8s?= Cc: guix-devel@gnu.org On Sun, Oct 30, 2016 at 10:47:36PM +0100, Ludovic Courtès wrote: > Leo Famulari skribis: > > > I noticed that btrfs-progs was updated to 4.8.2 on core-updates twice. > > > > Commited to core-updates: > > http://git.savannah.gnu.org/cgit/guix.git/commit/?h=core-updates&id=f02fb6dd6b6dbf91c3497a086bab5d9e791b2468 > > > > Commited on master and then merged into core-updates: > > http://git.savannah.gnu.org/cgit/guix.git/commit/?h=core-updates&id=6270769dc216fc6a2f54ca77d3090e3e610ade1c > > > > I've experienced similar shenanigans while testing my own merges. I > > wonder if there is anything we can do to avoid this? > > Is it a problem? I mean did ‘git merge’ trigger a conflict? I would > expect it to automatically notice that it’s the same change. I didn't do this merge so I'm not sure if Git presented a conflict to the user. In this case, it's not really a problem. But it makes me wonder what we've missed...