Wrong state after fixing git am conflict

[targos]

I was trying to land nodejs/node#21992 which had a small conflict to fix.

So I ran:

git node land 21992
# stopped at `git am`. fix conflict
git add .
git am --continue
git node land --continue

At this point, it tries to re-download and apply the patch.

[joyeecheung]

Are you using master or the npm release? It may be fixed by 34664c0

[targos]

The npm release. I didn't realize it was so for behind, sorry.

[joyeecheung]

No worries, I'll publish a new release

[targos]

Thank you! Since it's not common to land PRs which still have conflicts, I'll close this as likely fixed.