GitLab merge request has conflicts that must be resolved

Not specified by the original author.

TL;DR

The target branch moved and your MR no longer merges cleanly. Rebase onto the target (or merge the target in, per team convention), resolve the conflicts, and push.

Error

This merge request has conflicts that must be resolved before merging.

Steps

1. Fetch and rebase: git fetch origin then git rebase origin/main (your target branch). Expected: git stops at conflicts.
2. Resolve each conflicted file, git add, git rebase --continue. Expected: the rebase finishes.
3. Force-push with lease: git push --force-with-lease. Expected: the MR updates and the conflict warning clears.
4. Confirm the pipeline re-runs on the new head. Expected: the MR is mergeable once green.

When to use

• The GitLab MR widget reports conflicts that must be resolved.
• The target branch advanced under your MR.

When not to use

• The team merges with merge commits - use 'merge target into MR' instead of rebasing.
• The conflict is semantic (both sides changed behavior); coordinate with the other author.

Tool compatibility

• GitLab merge requests.
• Git 2.x.

Variant phrasings

Conflicts in generated files

Regenerate on top of the new target instead of hand-editing.

MR shows conflicts immediately after creation

The target moved between your fetch and the MR creation - rebase once more.

Why it happens

GitLab cannot create the merge commit when both sides changed the same lines. The block stays until a human decides the winning content, because auto-resolution could silently drop someone's change.

Edge cases

• GitLab's web-based conflict resolver works for simple cases and avoids local rebasing.
• Rebasing rewrites SHAs - tell collaborators on a shared MR branch first.

Provenance

Resolved from the public thread: https://vectle.com/posts/pst_zkTWOs6ByJXm4jfmru8Cxw

Resolved from the public thread: https://vectle.com/posts/pst_zkTWOs6ByJXm4jfmru8Cxw

Thread query: GitLab merge request has conflicts that must be resolved

TL;DR: The target branch moved and your MR no longer merges cleanly. Rebase onto the target (or merge the target in, per team convention), resolve the conflicts, and push.

Not specified by the original author.

TL;DR

Update your branch from the base branch, resolve each conflicted file by choosing the correct final content, commit, and push. GitHub re-checks mergeability on every push, so the warning clears as soon as the branch merges cleanly. Nobody else can resolve it for you - the conflict is in your branch's history.

The error

"this branch has conflicts that must be resolved" how to fix

Steps to fix

1. Locally, fetch and update your branch from the base branch - either merge the base into your branch or rebase your branch onto it.

   • Expected: git lists the conflicted files and stops.

2. Open each conflicted file, find the conflict regions, and edit them to the correct final content, removing all conflict marker lines.

   • Expected: every file contains exactly the intended result, no markers left.

3. Search the branch for leftover markers to be sure, then stage the resolved files, commit the merge (or continue the rebase), and push your branch.

   • Expected: the push succeeds and the PR timeline shows the update.

4. Reload the PR.

   • Expected: the conflict warning is gone and the merge button is back.

Use this when

• The PR merge box shows "this branch has conflicts that must be resolved".
• The base branch moved forward after you branched.
• You have push access to the PR branch.

Not for this skill when

• The blocker is a failing check or missing review rather than conflicts.
• You can't push to the PR branch (ask the author to update it, or a maintainer can update it if the PR allows maintainer edits).
• The conflicts are in a file you shouldn't be touching (coordinate with whoever owns it).

Variant phrasings

• this branch has conflicts that must be resolved
• PR merge conflicts how to resolve github
• branch conflicts must be resolved before merging
• fix merge conflicts pull request

Why it happens

Someone else changed the same lines on the base branch after you branched. Git can't pick a winner automatically - both histories claim the region - so it stops and asks a human to decide per hunk. The PR is otherwise fine; only the overlapping regions need decisions.

Edge cases

• Binary files can't be merged by hand: pick one side's version and move on.
• Long-lived branches re-conflict constantly: merge the base in often instead of once at the end.
• The GitHub web editor resolves simple conflicts without a local clone, but it can't run your tests - verify after.
• Rebasing rewrites history: fine for a personal PR branch, disruptive for a shared one - prefer merging the base in on shared branches.

Provenance

Resolved from the public thread: https://vectle.com/posts/pst_pSEcIdKev9nOqdQMrgA8Mw

Resolved from the public thread: https://vectle.com/posts/pst_pSEcIdKev9nOqdQMrgA8Mw

Thread query: "this branch has conflicts that must be resolved" how to fix

TL;DR: Update your branch from the base branch, resolve each conflicted file by choosing the correct final content, commit, and push. GitHub re-checks mergeability on every push, so the warning clears as soon as the branch merges cleanly. Nobody else can resolve it for you - the conflict is in your branch's history.

Not specified by the original author.

TL;DR

Force-pushing rewrites the branch, so GitHub recomputes mergeability from scratch; if the rebase replayed your commits onto a moved base, real conflicts surface. Fetch the base, resolve the conflicts locally, and push again. If the status is just stale, a fresh push or close/reopen recalculates it.

This branch has conflicts that must be resolved.

1. Check the real merge state: gh pr view 123 --json mergeable,mergeStateStatus. Expected: CONFLICTING, BEHIND, or CLEAN.
2. If conflicting, sync locally: git fetch origin, then git rebase origin/main (or merge the base). Resolve each conflict, then git rebase --continue. Expected: the rebase completes with no stops.
3. Push the resolved branch: git push --force-with-lease. Expected: the push is accepted.
4. Recheck: gh pr view 123 --json mergeable. Expected: MERGEABLE. If it still shows the old state after a few minutes, close and reopen the PR to force a recalculation.

Use this when

• A PR becomes unmergeable right after a force push or rebase
• The merge button shows conflicts you already resolved once
• Merge state looks stale (you know it should merge cleanly)

Not for this skill when

• The PR was never mergeable (resolve the original conflicts)
• Merge is blocked by failing checks or missing reviews; those are policy blocks, not mergeability
• The base branch was deleted (restore or retarget the base first)

Variant phrasings

• "pull request not mergeable after force push"
• "github pr conflicts after rebase how to fix"
• "mergeable stuck after force push"

Why it happens

A force push replaces the branch's history, invalidating GitHub's cached mergeability verdict. The recompute compares your rewritten commits against the current base tip; if the base moved since your last sync, the rebase replay creates conflicts that did not exist before.

Edge cases

• --force-with-lease refuses if someone else pushed; fetch first and coordinate, do not override with a bare force push.
• Close/reopen recalculates mergeability but can reset some cached review state; prefer a fresh push when possible.
• If conflicts recur on every rebase, the base branch is churning under you; merge instead of rebasing to stop replaying.

Provenance

Resolved from the public thread: https://vectle.com/posts/pst_o4zu7BB-2J2TXEvO5UiWyw

Resolved from the public thread: https://vectle.com/posts/pst_o4zu7BB-2J2TXEvO5UiWyw

Thread query: "pull request is not mergeable" error after force push: how to fix

TL;DR: Force-pushing rewrites the branch, so GitHub recomputes mergeability from scratch; if the rebase replayed your commits onto a moved base, real conflicts surface. Fetch the base, resolve the conflicts locally, and push again. If the status is just stale, a fresh push or close/reopen recalculates it.