Skip to content

Git rebase stuck after resolving conflicts #104502

@guoyunhe

Description

@guoyunhe
  • VSCode Version: 1.47.3
  • OS Version: openSUSE Tumbleweed

Steps to Reproduce:

  1. Checkout a branch that has conflicts with master/main branch
  2. Run git rebase master
  3. Resolve conflicts in VS Code
  4. Click the ✔️ icon in VS Code Git side panel

Result: the progress bar keeps rolling but never successfully rebase. I have to go to console and manually run git rebase --continue.

Does this issue occur when all extensions are disabled?: Yes

Metadata

Metadata

Assignees

Labels

info-neededIssue requires more information from poster

Type

No type
No fields configured for issues without a type.

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions