greenkeeper-lockfile-update fails with git merge error

[lewisakura]

CI Greenkeeper issue on my repo

Got this error where greenkeeper-lockfile-update fails with a git merge error relating to package-lock.json. This could perfectly be caused by the fact that we pull out an older copy of package-lock.json earlier when we restore the cache, but I've never seen this issue occur before.

For example, this worked perfectly fine with the current CI setup.

I have no clue how to fix this.

[janl]

@LewisTehMinerz sorry for the trouble here. Just checking, because there might be an easy way out: if you have only public dependencies (npm registry or git), you don’t need greenkeeper-lockfile anymore.

If you have private dependencies, you’ll need it for now, and we can look into debugging your problem, just let us know here.

[lewisakura]

@janl So we don't actually need to run greenkeeper-lockfile?

[cfanoulis]

Holds E to revive this chat

Hello there. I am working with @LewisTehMinerz on the same project that errors. Should we remove the lockfile stage on our CI?

[lewisakura]

we've removed greenkeeper-lockfile from our CI stage, we'll see what happens

[lewisakura]

everything works.