How often are you pulling from a shared branch that you are making local commits to
When more than one dev is working on a feature branch? You could take feature/a, branch off feature/a.1 for your local work but at some point you gotta incorporate work from feature/a. Not so different from origin/main -> main.
git pull --ff-only should really be the default (changeable) behavior.
Comments
When more than one dev is working on a feature branch? You could take feature/a, branch off feature/a.1 for your local work but at some point you gotta incorporate work from feature/a. Not so different from origin/main -> main.
git pull --ff-only should really be the default (changeable) behavior.
The other choice being git pull --rebase, with "git merge" being removed from the git suite.