vscode: Git rebase stuck after resolving conflicts
- VSCode Version: 1.47.3
- OS Version: openSUSE Tumbleweed
Steps to Reproduce:
- Checkout a branch that has conflicts with master/main branch
- Run
git rebase master
- Resolve conflicts in VS Code
- 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
About this issue
- Original URL
- State: closed
- Created 4 years ago
- Comments: 15 (7 by maintainers)
Here is my screen recording https://www.youtube.com/watch?v=OqkJXY8j8iY