Merge fails with a conflict that isn't there #245
Loading…
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
What happens
git.pr.mergefails with "no longer merges into main: the base moved". But main hadn't moved, and a plain retry merged fine.Why
Forgejo answered "Please try again later" while its mergeable check was still running. Braid read the PR once, saw
mergeable: false, and called it a conflict.Cost
4 of 9 merges in the pinball test. Each one waited for a manual retry: 18.6 min in all.
Fix
Done when
A merge Forgejo defers retries on its own and goes through.
Where to look:
src/osf/forgejo.py, around line 2721 (the path from #221).From the Braid vs Claude Code pinball test, 2026-10-27 (runs 110–120).
What shipped
Test
tests/forge/test_merge.py(real git): a deferred merge goes through; a moved base fails as before.Shipped in
5598ddf(OpenSpec changereliable-dispatch-merge-and-ci-evidence, archived).