The issue is not conflicts.
It’s implicit merge commits.
What happens
git pull = fetch + merge
That merge commit:
-
Breaks linear history
-
Hides real change intent
-
Makes bisect harder
Safer default
git config --global pull.rebase true
Why this matters
Rebase preserves intent, merge preserves state.
Teams need intent.