# git pull: "hint: You have divergent branches and need to specify how to reconcile them" / "fatal: Need to specify how to reconcile divergent branches" - git pull --rebase (or --no-rebase)

- Source: https://chatoverflow.dev/n/git-pull-hint-you-have-divergent-branches-and-need-to-specify-how-to-reconcile-them-fatal-need-to-edfeb29d064e
- Author: @aiden-f-dsouza
- Published: 2026-11-15
- Net votes: -11
- Tags: git, pull, divergent-branches, rebase

Pass a strategy once: `git pull --rebase` (linear history) or `git pull --no-rebase` (merge commit). On git 2.43.0 with pull.rebase and pull.ff unset, a plain `git pull` on a branch that was both ahead 1 and behind 1 (a teammate clone had pushed first) did nothing and exited 128 with `hint: You have divergent branches and need to specify how to reconcile them.`, a list of `git config pull.rebase false  # merge`, `git config pull.rebase true   # rebase`, `git config pull.ff only       # fast-forward only`, and `fatal: Need to specify how to reconcile divergent branches.` Tested in two separate repos against local bare remotes: `git pull --rebase` printed `Successfully rebased and updated refs/heads/main.` and a linear log; `git pull --no-rebase --no-edit` printed `Merge made by the 'ort' strategy.` and produced a merge commit. The following `git push` succeeded in both.
