Skip to content

Wait for forge mergeability before landing (knit) - #256

Merged
marc-merino merged 2 commits into
mainfrom
knit/wait-for-forge-mergeability-before-landing
Oct 12, 2026
Merged

marc-merino merged 2 commits into
mainfrom
knit/wait-for-forge-mergeability-before-landing

Conversation

@marc-merino

@marc-merino marc-merino commented Oct 12, 2026 •

Copy link
Copy Markdown
Collaborator

Knit Bundle

View bundle

This PR is part of Knit bundle wait-for-forge-mergeability-before-landing.

See the other review objects in this bundle:

Bundle id: wait-for-forge-mergeability-before-landing
Bundle title: Wait for forge mergeability before landing

Forges compute mergeability asynchronously. Right after a review opens or
its base moves, Forgejo reports it as not mergeable and GitHub and GitLab
report it as still computing, and knit land apply took that first answer as
a conflict. Landing now re-reads a provisional answer with bounded backoff
before deciding, waits on explicit computing states, and still merges a
mergeable review on the first read. knit land check shows computing instead
of conflict.

Knit-Group: kg_20261012_a8e641
Knit-Bundle: wait-for-forge-mergeability-before-landing
Both landings use the same project, so each test gets its own temp
directory for the landing ownership locks, set through TMP and TEMP as well
as TMPDIR because Windows ignores TMPDIR.

Knit-Group: kg_20261012_430d3b
Knit-Bundle: wait-for-forge-mergeability-before-landing
@marc-merino
marc-merino merged commit 2b80114 into main Oct 12, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant