[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: heads-up: Haskell updates
From: |
Danny Milosavljevic |
Subject: |
Re: heads-up: Haskell updates |
Date: |
Fri, 16 Feb 2018 16:26:42 +0100 |
git am just failed because the index is not matching.
So I'll not push my core-updates.
Next, I tried git merge origin/master which gave me a number of merge conflicts.
One of those is gnu/local.mk:
+ %D%/packages/patches/gettext-multi-core.patch \
+ %D%/packages/patches/gettext-gnulib-multi-core.patch \
These referred files haven't been merged into core-updates by my action above.
Why?
- Re: core-updates, last call?, (continued)
- Re: core-updates, last call?, Ricardo Wurmus, 2018/02/18
- Re: heads-up: Haskell updates, Chris Marusich, 2018/02/18
- Re: heads-up: Haskell updates, Mark H Weaver, 2018/02/15
- Re: heads-up: Haskell updates, Danny Milosavljevic, 2018/02/15
- Re: heads-up: Haskell updates, Danny Milosavljevic, 2018/02/15
- Re: heads-up: Haskell updates, Andreas Enge, 2018/02/15
- Re: heads-up: Haskell updates, Ricardo Wurmus, 2018/02/15
- Re: heads-up: Haskell updates, Danny Milosavljevic, 2018/02/15
- Re: heads-up: Haskell updates, Leo Famulari, 2018/02/15
- Re: heads-up: Haskell updates, Mark H Weaver, 2018/02/15
- Re: heads-up: Haskell updates,
Danny Milosavljevic <=
- Re: heads-up: Haskell updates, Marius Bakke, 2018/02/16
- Re: heads-up: Haskell updates, Ricardo Wurmus, 2018/02/16
- Re: heads-up: Haskell updates, Marius Bakke, 2018/02/16
- Re: heads-up: Haskell updates, Leo Famulari, 2018/02/16
- Re: heads-up: Haskell updates, Mark H Weaver, 2018/02/16
- Re: heads-up: Haskell updates, Mark H Weaver, 2018/02/16
- Re: heads-up: Haskell updates, Ricardo Wurmus, 2018/02/16
- Re: heads-up: Haskell updates, Oleg Pykhalov, 2018/02/17
- Re: heads-up: Haskell updates, Ricardo Wurmus, 2018/02/17
- Re: heads-up: Haskell updates, Oleg Pykhalov, 2018/02/17