guix-devel
[Top][All Lists]
Advanced

[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?



reply via email to

[Prev in Thread] Current Thread [Next in Thread]