Gitflow
🚫Stuck PR — Approved But BlockedMedium+550 XP
Workshop
Scenario reference

Stuck PR — Approved But Blocked: the situation, step by step

The situation

PR #247 has 2 approvals but 'conflicts must be resolved'. Merge button disabled.

8 commits landed on main during 3-day review. Two refactored your module.

Medium · 6 steps · +550 XP

What you will practice

This scenario walks through 6 steps, in order:

  1. 01Fetch latest
  2. 02Merge main (preserves approvals)
  3. 03Check conflicts
  4. 04Stage resolved
  5. 05Commit merge
  6. 06Push
Reveal the step-by-step commands

Try the terminal first — you learn more by doing. When you want to check yourself, here is the command for each step.

  1. 1. Fetch latest
    git fetch
  2. 2. Merge main (preserves approvals)
    git merge main
  3. 3. Check conflicts
    git status
  4. 4. Stage resolved
    git add .
  5. 5. Commit merge
    git commit -m "merge main"
  6. 6. Push
    git push

Key takeaway

Merge (not rebase) preserves commit hashes so approvals stay valid.

← Browse all scenarios