Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

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

Copy link
Copy link
@dscho

Description

@dscho
Issue body actions

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.

Reactions are currently unavailable

Metadata

Metadata

Assignees

No one assigned

    Labels

    bugSomething isn't workingSomething isn't working

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions

      Morty Proxy This is a proxified and sanitized view of the page, visit original site.