[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: core-updates merged!
From: |
Leo Famulari |
Subject: |
Re: core-updates merged! |
Date: |
Wed, 3 Aug 2016 00:04:46 -0400 |
User-agent: |
Mutt/1.6.0 (2016-04-01) |
On Tue, Aug 02, 2016 at 11:28:59PM +0200, Ludovic Courtès wrote:
> Leo Famulari <address@hidden> skribis:
> Otherwise LGTM; could you push it to core-updates-next?
I merged master into core-updates-next and made the change in a
subsequent commit.
Unfortunately, I can't push the branch to Savannah because it contains
the following unsigned commits (one of them is mine, oops!):
f21403e2b6f5a9491937a0cc9f31fc113998ce5e
9bc84dfea9560c497c91863e7b5021860bd3c254
745ad37a780b28f72ac9dfcc8092317e577e51c9
2d74d94b17b23ab95072da68553d85ac0b3bfede
aebd383d04b351465cfb14e4fd0949b67d4b282e
What should we do?
In the meantime, you can inspect the updated branch on my personal Git
repo:
https://github.com/lfam/guix/commits/core-updates-next
And, since these big merge commits make me nervous, I made notes of all
the conflicts that I had to resolve. They are attached.
conflicts
Description: Text document
- Core-updates, Andreas Enge, 2016/08/01
- core-updates merged!, Ludovic Courtès, 2016/08/01
- Re: core-updates merged!, ng0, 2016/08/02
- Re: core-updates merged!, Ludovic Courtès, 2016/08/02
- Re: core-updates merged!, Leo Famulari, 2016/08/02
- Re: core-updates merged!, Ludovic Courtès, 2016/08/02
- Re: core-updates merged!,
Leo Famulari <=
- Re: core-updates merged!, Ludovic Courtès, 2016/08/03
- Re: core-updates merged!, Leo Famulari, 2016/08/03
- Re: core-updates merged!, Ludovic Courtès, 2016/08/03
- Re: core-updates merged!, Leo Famulari, 2016/08/03
- Re: core-updates merged!, Ludovic Courtès, 2016/08/03
- Re: core-updates merged!, Leo Famulari, 2016/08/03
- Re: core-updates merged!, Andreas Enge, 2016/08/03
- Re: core-updates merged!, Leo Famulari, 2016/08/03
- ‘core-updates’ merge is a squashed commit, Ludovic Courtès, 2016/08/03
- Re: ‘core-updates’ merge is a squashed commit, Leo Famulari, 2016/08/03