Learn how to safely recover a production Next.js app after a broken Git pull. Fix merge conflicts, use stash vs reset --hard, rebuild with PM2, and verify zero downtime deployment.
Running a production Next.js app means one thing: sooner or later, a deployment will break.
One of the most common production deployment failures happens right after a routine update:
git pullInstead of updating cleanly, Git throws this:
error: Your local changes to the following files would be overwritten by merge
Please commit your changes or stash them before you merge.
AbortingIf your app is live and managed by PM2, this error can trigger panic fast.
Should you stash?
Should you force reset?
Will your production app go offline?
In this guide, I’ll show the exact recovery workflow for safely fixing a broken production Git pull on a Next.js server — without unnecessary downtime.
There are three ways to recover.
Choosing the wrong one can destroy changes you still need.
---
Use this if you might need the current local changes.
git stash push -m "production-emergency-backup"This safely stores all local modifications.
---
git pull origin mainIf successful, your repo is now updated.
---
npm install
npm run build---
pm2 restart your-app-name---
pm2 logs your-app-name --lines 50Then test locally:
curl http://localhost:3000If the app responds correctly, deployment succeeded.
---
Use this when your production server should exactly match GitHub.
This is the most common solution for production servers.
⚠️ Warning: This permanently deletes local uncommitted changes.
---
git fetch origin---
git reset --hard origin/mainThis instantly restores your repo to match GitHub.
---
git clean -fdThis removes leftover files that can break builds.
---
npm install---
npm run build---
pm2 restart your-app-name---
If you're unsure what changed:
git statusThen inspect the exact diff:
git diffThis helps determine whether the local changes matter.
---
For live Next.js deployments, use this exact sequence:
Never restart PM2 before a successful build.
Correct order:
git pull
npm install
npm run build
pm2 restart your-app-nameWrong order:
pm2 restart your-app-name
npm run buildThat can cause temporary downtime.
---
A PM2 restart does not guarantee a healthy deployment.
Always verify:
pm2 statusLook for:
---
pm2 logs your-app-nameWatch for:
---
curl -I http://localhost:3000Expected:
HTTP/1.1 200 OK---
Even after fixing Git pull conflicts, these often appear:
Error: Could not find a production buildFix:
npm run build---
Fix:
npx prisma generate
npx prisma migrate deploy---
Fix:
rm -rf node_modules package-lock.json
npm install---
Fix:
pm2 delete your-app-name
pm2 start npm --name "your-app-name" -- start---
For most self-hosted Next.js production apps:
If local changes are irrelevant:Use hard reset.
git fetch origin
git reset --hard origin/main
git clean -fd
npm install
npm run build
pm2 restart appUse stash first.
This gives maximum safety with minimal risk.
---
The “local changes would be overwritten by merge” error looks scary, but it’s usually a simple state mismatch between your production server and GitHub.
The key is choosing the right recovery path:
In production, reliability matters more than speed.
A controlled recovery beats a rushed deploy every time.