Victor's room

Overview & Root Cause Summary: The error fatal: Not possible to fast-forward, aborting (accompanied by hint: You have divergent branches and need to specify how to reconcile them) occurs during git pull when both your local branch and the remote tracking branch contain new, independent commits. Modern Git (version 2.27+) halts the pull operation to prevent ambiguous default merges, requiring developers to explicitly declare whether to reconcile the diverged histories using a merge commit or a rebase.

Understanding the Root Causes

• Divergent Commit Histories: You created commits locally while teammates simultaneously pushed new commits to the same remote branch, creating two diverging timelines from a common ancestor.
• Default Git 2.27+ Pull Safety Enforcement: Modern Git versions discontinued automatic implicit merge commits when pulling divergent branches without an explicit pull.rebase configuration.
• Strict Fast-Forward Configuration (pull.ff only): Your local or global Git config has pull.ff = only, which deliberately rejects any pull operation that cannot be completed by simply sliding the branch pointer forward.

Step 1: Quick Fix (Choose Merge or Rebase for the Current Pull)

Reconcile the divergent histories immediately for your current session by passing an explicit reconciliation flag.

# Option A: Reconcile via a standard merge commit (creates a merge commit):
git pull --no-rebase

# Option B: Reconcile via rebase (replays local commits on top of remote changes, linear history):
git pull --rebase

# Option C: Inspect branch divergence before deciding:
git log --graph --oneline --left-right HEAD...origin/$(git branch --show-current)

Step 2: Configure a Permanent Global Pull Strategy

Eliminate recurring warning prompts by establishing a default reconciliation preference in your global Git configuration.

# Strategy 1: Default to Merge (preserves distinct branch shapes and commit timestamps):
git config --global pull.rebase false

# Strategy 2: Default to Rebase (preferred for clean, linear commit histories without merge bubbles):
git config --global pull.rebase true

# Strategy 3: Fast-Forward Only (forces manual intervention when divergence occurs):
git config --global pull.ff only

Step 3: Resolving Merge Conflicts During Rebase Reconciliation

If rebasing encounters conflicting changes between local and remote modifications, resolve the conflict markers and advance the rebase sequence.

# 1. Inspect conflicted files:
git status

# 2. Edit conflicted files, resolve conflict markers (<<<<<<<, =======, >>>>>>>), and stage them:
git add <resolved_file>

# 3. Continue the rebase:
git rebase --continue

# (Emergency Exit) If you want to abort the rebase and return to the pre-pull state:
git rebase --abort

Verification & Testing Steps

Confirm that your pull strategy is active and test synchronization with the remote repository.

# 1. Verify active global pull configuration:
git config --get-all pull.rebase
git config --get-all pull.ff

# 2. Inspect commit history tree to verify integration:
git log --graph --oneline -n 5

# 3. Run a clean git pull:
git pull

Summary Comparison Table