primitive using PrimWrappers rather than PrimOpWrappers?
ggreif at gmail.com
Wed Sep 18 22:50:48 UTC 2013
$ git pull --rebase
just pulls and then rebases your local commits. It gives up (with an
error message) if there are unstaged changes in the workspace.
On 9/19/13, Carter Schonwald <carter.schonwald at gmail.com> wrote:
> what does the rebase flag do? I did my rebase via the sourcetree gui app..
> On Wed, Sep 18, 2013 at 6:40 PM, Gabor Greif <ggreif at gmail.com> wrote:
>> I had the same error, turned out that
>> ./sync-all pull --rebase
>> did not correctly terminate, because I had modified files around
>> This helped:
>> ./sync-all pull
>> perl boot
>> make --keep-going
>> On 9/19/13, Carter Schonwald <carter.schonwald at gmail.com> wrote:
>> > hey all,
>> > i just rebased my prefetch patch onto HEAD, and now i'm working on
>> > ghc to build
>> > looks like Data.Primitive.Types is trying to import PrimWrappers rather
>> > than PrimOpWrappers?
>> > i patched that up in my local build, but that seems to be missing,
>> > unless
>> > i'm overlooking somthing and i'm botching the submodules?
More information about the ghc-devs