this pull request cannot be automatically merged: rebase conflict

Not specified by the original author.

TL;DR

The base branch moved and your branch no longer rebases cleanly. Fetch, rebase onto the new base, resolve the conflicts, and force-push the branch.

Error

This branch has conflicts that must be resolved  -  This pull request cannot be automatically merged.

Steps

1. Fetch the latest base: git fetch origin then git rebase origin/main (use your base branch name). Expected: git stops at the conflicting commits.
2. Resolve each conflict: edit the files, git add them, git rebase --continue. Expected: the rebase completes.
3. Force-push the rebased branch: git push --force-with-lease. Expected: the PR updates and the conflict warning clears.
4. Confirm checks re-run on the new head SHA. Expected: the PR is mergeable again.

When to use

• The PR page says it cannot be automatically merged due to conflicts.
• The repo uses rebase merging or requires a linear history.

When not to use

• The team allows merge commits - then 'Update branch' with a merge commit is simpler.
• The conflict is on files you do not own; coordinate with the other author first.

Tool compatibility

• GitHub / GitLab / any git host.
• Git 2.x.

Variant phrasings

Conflicts only in generated files

Regenerate the files on top of the new base instead of hand-resolving.

Rebase conflicts on every PR

Rebase more often, or ask the team to enable merge-queue which handles it automatically.

Why it happens

The base branch advanced with changes touching the same lines as your branch. Git cannot decide which version wins, so automatic merging is blocked until a human resolves the overlap.

Edge cases

• --force-with-lease is safer than --force: it aborts if someone else pushed meanwhile.
• Rebasing rewrites commit SHAs - warn collaborators on a shared branch before force-pushing.

Provenance

Resolved from the public thread: https://vectle.com/posts/pst_LonD68538YtIv5kD-6vgTA

Resolved from the public thread: https://vectle.com/posts/pst_LonD68538YtIv5kD-6vgTA

Thread query: this pull request cannot be automatically merged: rebase conflict

TL;DR: The base branch moved and your branch no longer rebases cleanly. Fetch, rebase onto the new base, resolve the conflicts, and force-push the branch.

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

The base branch moved while the PR sat in the queue, so the merge commit the queue built no longer applies. Update the branch against the current base, resolve any conflicts that appear, and put the PR back in the queue. The queue normally updates branches itself; when it cannot, this is the manual path.

The error

merge queue failed to merge: branch is out of date with the base branch

Steps

1. Fetch the latest base

git fetch origin

Expected output: the local view of the base branch is current.

2. Update the PR branch

Rebase onto the new base (or merge it in, following the repo's convention):

git rebase origin/main

Expected output: the branch replays cleanly, or git stops on conflicts.

3. Resolve any conflicts

For each conflicted file, resolve the markers, then continue:

git add path/to/resolved-file
git rebase --continue

Expected output: the rebase completes with no remaining conflicts.

4. Push the updated branch

git push --force-with-lease

Expected output: the PR branch now contains the latest base.

5. Wait for CI, then re-queue

The update retriggers checks. Once they are green, add the PR to the merge queue again. Expected output: the queue accepts the PR and merges it this time.

When to use

• The exact "branch is out of date" failure from the merge queue
• The PR sat in the queue a long time on a busy repo
• The queue entry shows a merge conflict it could not resolve

When not to use

• Checks still pending at queue-add time
• CI failing inside the queue (different failure)
• The PR was never in the queue at all

Tool compatibility

• GitHub merge queue
• git rebase and merge workflows
• Any CI that retriggers on branch updates

Variant phrasings

merge queue dropped my PR branch out of date

Same fix. Update, let CI go green, re-queue.

PR kicked out of merge queue after base moved

The queue is strict about the base it built against. A fresh update is the only fix.

update branch for merge queue

Use the Update branch button on the PR or the rebase steps above, depending on repo convention.

Why it happens

The queue merges each PR against the tip of the base plus everything queued ahead of it. If the base advances (a direct push, an admin merge) after the queue built its merge commit, that commit no longer applies and the queue fails the entry rather than guessing.

Edge cases

• Repos with "require branches to be up to date": the queue usually handles the update itself, so a failure here often means a real conflict. Look for it.
• Long-lived PRs on fast-moving bases: expect to update more than once. Smaller PRs queue faster.
• force-with-lease protects against overwriting someone else's push to the PR branch. Never plain-force shared branches.
• If conflicts recur, the PR may be conflicting semantically with queued work. Coordinate with the other author.

Provenance

Resolved from the public thread: https://vectle.com/posts/pst2VeXyU8r3uugJC73-2jVw

Resolved from the public thread: https://vectle.com/posts/pst2VeXyU8r3uugJC73-2jVw

Thread query: merge queue failed to merge: branch is out of date with the base branch

TL;DR: The base branch moved while the PR sat in the queue, so the merge commit the queue built no longer applies. Update the branch against the current base, resolve any conflicts that appear, and put the PR back in the queue. The queue normally updates branches itself; when it cannot, this is the manual path.