From: Leo Famulari <leo@famulari.name>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: guix-devel@gnu.org
Subject: Re: btrfs-progs updated to 4.8.2 twice
Date: Mon, 31 Oct 2016 13:56:42 -0400 [thread overview]
Message-ID: <20161031175642.GD27555@jasmine> (raw)
In-Reply-To: <87lgx5se4n.fsf@gnu.org>
On Sun, Oct 30, 2016 at 10:47:36PM +0100, Ludovic Courtès wrote:
> Leo Famulari <leo@famulari.name> 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...
prev parent reply other threads:[~2016-10-31 17:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-28 2:17 btrfs-progs updated to 4.8.2 twice Leo Famulari
2016-10-30 21:47 ` Ludovic Courtès
2016-10-31 17:56 ` Leo Famulari [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161031175642.GD27555@jasmine \
--to=leo@famulari.name \
--cc=guix-devel@gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.