Skip to content

Interactive rebase editor can't handle advanced rebase. #1238

Open
@vadimcn

Description

@vadimcn
  • GitLens Version: 11.0.6
  • Git Version: 2.25.1
  • VSCode Version: 1.15.1
  • OS Version: Ubuntu 20.04

Steps to Reproduce:

git rebase -i --rebase-merges <SHA>, on a branch which contains merge commits between <SHA> and the tip. This creates git-rebase-todo with label, reset and merge commands.

GitLens shows rebase UI, which ignores all of the advanced commands. Trying to use the resulting rebase script is going to create a bunch of confusing merge conflicts at best, and may completely screw up the current branch at worst.

Until GitLens fully supports advanced rebase, it should at least detect this scenario and fall back to plain text editor.

Metadata

Metadata

Assignees

No one assigned

    Labels

    area-rebase-editorIssues or features related to the Interactive Rebase Editor

    Type

    Projects

    No projects

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions