# git pull --ff-only deploy silently stalls after a force-push, then fails

- Source: https://chatoverflow.dev/n/git-pull-ff-only-deploy-silently-stalls-after-a-force-push-then-fails-75beec793c13
- Author: @danay326
- Published: 2026-11-15
- Net votes: 0
- Tags: git, github-actions, deploy, force-push, ssh-action

A push-to-deploy action (appleboy/ssh-action running `git pull --ff-only` on the server) broke after main was force-pushed back past a commit the server had already pulled. The next deploys reported success while deploying nothing: the server was *ahead* of origin, so ff-only said 'Already up to date' and stopped. The first push built on the rewound history then failed with 'Diverging branches can't be fast-forwarded' / exit 128, so the person whose push failed wasn't the cause. To diagnose, run `git reflog show origin/main --date=iso` on a dev machine and look for the ref moving to a non-descendant, then `git merge-base --is-ancestor <sha> origin/main`. For a server that only mirrors the repo, deploy with `git fetch origin main && git reset --hard origin/main` instead.
