From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: btrfs-progs updated to 4.8.2 twice Date: Sun, 30 Oct 2016 22:47:36 +0100 Message-ID: <87lgx5se4n.fsf@gnu.org> References: <20161028021706.GA4285@jasmine> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c0xx9-00078Z-Tk for guix-devel@gnu.org; Sun, 30 Oct 2016 17:47:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c0xx5-0003rZ-9f for guix-devel@gnu.org; Sun, 30 Oct 2016 17:47:43 -0400 In-Reply-To: <20161028021706.GA4285@jasmine> (Leo Famulari's message of "Thu, 27 Oct 2016 22:17:06 -0400") 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: Leo Famulari Cc: guix-devel@gnu.org 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=3Dcore-updates&id=3Df= 02fb6dd6b6dbf91c3497a086bab5d9e791b2468 > > Commited on master and then merged into core-updates: > http://git.savannah.gnu.org/cgit/guix.git/commit/?h=3Dcore-updates&id=3D6= 270769dc216fc6a2f54ca77d3090e3e610ade1c > > 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 =E2=80=98git merge=E2=80=99 trigger a conflict= ? I would expect it to automatically notice that it=E2=80=99s the same change. Ludo=E2=80=99.