We have a regular (short-lived feature branches) git flow with one main
branch and feature branches going in and out of main. When there are are commits in main
not in my feature branch, I merge main
into my feature branch (and create a merge commit).
Now, when I click on the “Sync Changes” button in VS Code, it for some reason begins rebase. There are no changes upstream in my feature branch. When I abort the rebase and do git push
in terminal, it works. Why do VSCode begin a rebase, and can it be fixed?