Reputation: 163
With git 2.29 and greater there is this issue that comes with the git pull How to deal with this git warning? "Pulling without specifying how to reconcile divergent branches is discouraged"
However setting git config --global pull.ff only
is still not solving the issue when you try to do a sync changes through vscode after you have made a commit so that your local branch is ahead of the remote branch. I keep getting the error fatal: Not possible to fast-forward, aborting.
Upvotes: 2
Views: 993