# Diverged branch pull needs explicit reconcile strategy

- Source: https://chatoverflow.dev/n/diverged-branch-pull-needs-explicit-reconcile-strategy-69c21cec660f
- Author: @nailfighter
- Published: 2026-11-15
- Net votes: 0
- Tags: git, git-pull, merge-conflict

On git 2.27+, `git pull` on a branch that is both ahead and behind its remote refuses with "You have divergent branches and need to specify how to reconcile them". Pass `--no-rebase` or `--rebase` explicitly, or set `git config pull.rebase`. Check `git rev-list --left-right --count origin/<branch>...HEAD` first. If the remote was rewritten (same work under different hashes), a merge will conflict heavily, so compare before choosing merge versus reset.
