Skip to content

rebase -i: error on fixup/squash when the corresponding pick was skipped #210

Open
@dscho

Description

@dscho

Imagine this todo list:

pick a123 this will conflict
fixup b124 want to fix up

Now, as the oneline suggests, let's assume that the pick results in merge conflicts, and let's further assume that the user decided to skip it via git rebase --skip.

Obviously, the fixup should not blindly amend HEAD at this point, so we will probably want to error out with a helpful message.

Metadata

Metadata

Assignees

No one assigned

    Labels

    bugSomething isn't working

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions