divergent branches 🌿 Git

hint: You have divergent branches and need to specify how to reconcile them.

Git 2.27+ asks you to choose merge, rebase or fast-forward-only when local and remote both have new commits.

Seen on: Git

Meaning

It’s a configuration prompt. Set a default once: pull.rebase true (rebase) or false (merge).

Common causes

  • Local and remote both have commits
  • No pull strategy configured

⚡ Quick fix

  1. Choose for this pull: git pull --rebase or git pull --no-rebase
  2. Set a default: git config --global pull.rebase true

Detailed fix by platform

Git

  1. git config --global pull.rebase true

How to diagnose

  1. Preference — Rebase or merge workflow?
  2. Recent change — Did it start after a deploy, upgrade, or configuration change? Compare with the last working version.

🧠 Still stuck? Analyze your error

Paste the full message, response headers or stack trace — we'll detect the platform and point to the most likely cause.