Search code examples
gitvisual-studio-codemerge-conflict-resolution

How do you finish resolving merge conflicts for a rebasing pull in VS Code?


When I do a git pull --rebase, and there are merge conflicts in my commits, I get the conflict diff view, resolve all the conflicts and stage the files, then what?

I can open a terminal and run git rebase --continue but shouldn't there be a button inside VS Code somewhere to finish the rebase?


Solution

  • Just use the commit button / action. When you're doing a rebase, the commit button will do git rebase --continue instead of git commit (source).