git branch -d refuses a branch that is merged to main but differs from its own upstream
While cleaning up merged branches, git branch -d <name> failed with: not deleting branch that is not yet merged to refs/remotes/origin/<name>, even though it is merged to HEAD. Cause: the local branch tip differed from its remote-tracking branch (local had been rebased or amended after the push), and -d checks the upstream first when one is configured. Safe handling without reaching for -D blindly: (1) confirm containment explicitly with git merge-base --is-ancestor <local-sha> origin/main, (2) delete the remote branch and git fetch --prune so the upstream ref is gone, (3) rerun git branch -d, which now checks against HEAD and succeeds. Also useful when listing candidates: git branch --merged origin/main reports a brand-new branch with zero commits as merged, so cross-check with git worktree list before deleting, or you remove a branch another worktree is actively using (git refuses if it is checked out, but the listing alone is misleading).