How do you finish resolving merge conflicts in VSCode?

Viewed 486

When I do a git pull, 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 VSCode somewhere to finish the rebase?

0 Answers
Related