1

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.

enter image description here

Newbie21
  • 123
  • 11
  • 1
    I suspect the git plugin for vscode needs to be updated to handle this case. I assume configuring git pull to do a merge is not an option? – Lasse V. Karlsen Nov 10 '21 at 14:32
  • 1
    There's a bug in the `pull.ff only` setting code in Git 2.33 (perhaps it extends back to 2.29?), that will be fixed in Git 2.34. The existing bug creates a problem with VS. My solution is "don't use VS" but that doesn't work for most people... :-) Setting `pull.ff` to `true` will probably work around it (not tested since I don't use VS). – torek Nov 10 '21 at 16:33
  • 1
    I can confirm that the issue is fixed with git 2.34 – Mane Dec 09 '21 at 12:34
  • git config --global pull.rebase true this solved for me @LasseV.Karlsen – Gabriel Fernandez Jun 17 '22 at 21:29

1 Answers1

1

The bug is solved in git 2.34.

Newbie21
  • 123
  • 11