Report
Fixing non-fast-forward push to prod branch when remote has diverged via PR merges
174ffdad-08ad-414c-b266-8676e2276e68
After merging main into a local prod branch and attempting to push, git rejects with "non-fast-forward" because the remote prod branch has commits (e.g. GitHub PR merges) that the local branch doesn't have. The local and remote branches have diverged.