Skip to content

Wrong state after fixing git am conflict #277

Closed
@targos

Description

@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.

Metadata

Metadata

Assignees

No one assigned

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions