Resolve Conflicts does not work

[Richard12434]

Select Topic Area

Question

Body

In our Project we need to resolve Conflicts to merge a PR, if we try it sends us to an error page. The problem is, that none of the gitHub servers are down, does anyone know how to fix, or has the same problem?

[DavitEgoian]

The error isn’t on your side, the GitHub web editor simply can’t process the conflict. Resolving the conflicts locally is the reliable workaround.

Steps:

1. Pull the PR branch locally.
2. Merge or rebase the base branch into it (git merge or git rebase ).
3. Fix the conflicts in your editor.
4. Commit and push the updated branch.

[INikolOFF]

If GitHub shows an error when trying to resolve conflicts, even though the servers are up, it usually means the web conflict editor can’t load the diff — the PR is too large, contains binary/minified files, or the PR index is stuck.

The simplest fix is to resolve the conflicts locally and push the result.
If that doesn’t work, the problem is on GitHub’s side and you’ll need to contact suppor

Try this :

Resolve the conflicts locally (most reliable):

git checkout
git fetch origin
git merge origin/main

or

git rebase origin/main

Fix conflicts in your editor, then:

git add .
git commit
git push --force-with-lease

Clear PR cache by pushing a no-op commit
Sometimes GitHub’s PR index gets stuck.
You can fix it with:

git commit --allow-empty -m "Trigger GitHub reindex"
git push

I hope this fix your problem

[github-actions[bot]]

🕒 Discussion Activity Reminder 🕒

This Discussion has been labeled as dormant by an automated system for having no activity in the last 60 days. Please consider one the following actions:

1️⃣ Close as Out of Date: If the topic is no longer relevant, close the Discussion as out of date at the bottom of the page.

2️⃣ Provide More Information: Share additional details or context — or let the community know if you've found a solution on your own.

3️⃣ Mark a Reply as Answer: If your question has been answered by a reply, mark the most helpful reply as the solution.

Note: This dormant notification will only apply to Discussions with the Question label. To learn more, see our recent announcement.

Thank you for helping bring this Discussion to a resolution! 💬