Error fix
How to fix “Git merge conflict”
Two branches edited the same lines; Git stopped for manual resolution.
Updated Apr 20, 2026
Fastest fix
Start here first. Step 1 fixes most cases—then work down the list.
- Reproduce with the smallest URL/command and capture full stderr or response body.
- Confirm versions (runtime, CLI, framework) against official requirements.
- Compare with CI or a second machine to rule out local-only issues.
What this means
Two branches edited the same lines; Git stopped for manual resolution. Use the steps below as a practical checklist—adapt commands to your OS and stack.
Common causes
Environment mismatch
Different Node/OS versions, missing env vars, or drift between local and deployed configs.
Bad inputs or timing
Race conditions, partial deploys, or hitting endpoints before dependencies are ready.
Step-by-step fix
Isolate and verify
- Reproduce with the smallest URL/command and capture full stderr or response body.
- Confirm versions (runtime, CLI, framework) against official requirements.
- Compare with CI or a second machine to rule out local-only issues.
Related
FAQ
- Is this tailored to my exact stack?
- These pages are structured guides. Swap in your package manager, paths, and hosting dashboard names.
- What should I paste into support?
- Full error text, timestamps, versions, and whether it reproduces in a clean profile or container.
- Can I share this page?
- Yes—each fix has a stable URL. Use “Copy fix link” on the page for teammates.
Fix related issues
Still stuck? Try these related fixes next.
- ESLint parsing errorThe file isn’t valid for the parser—wrong parser, JSX in .ts, or stage-3 syntax without plugin.
- TypeScript cannot find nameA symbol is used without a declaration or import—typo, missing import, or wrong tsconfig scope.
- Module not found (webpack / bundler)The bundler could not resolve a file path—case sensitivity, extension, or missing file on disk.
- Missing package.json fileNode/npm expected a package.json in this folder—the project root is wrong or the file was never created.
- Axios network error (browser)Axios could not reach the server—no response object; often CORS, TLS, or offline.
Edit your error
Tweak the message and run again—we'll match an existing fix or generate a new page.
Original error message
CONFLICT (content): Merge conflict in ...