Repository navigation
[2/2] docs: PRs open ready, nothing merges without Alexander's word - #204
Merged
Merged
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
arudaev
changed the title
…r merge GitHub's stacked PRs need each branch to contain the one below; the playtest and world stacks diverged on 25 Oct after fixes were carried up by cherry-pick. CONTRIBUTING says how to do it now: rebase each branch above onto the new tip below and push with --force-with-lease, with Alexander's OK. Refs #202
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What and why
PRs open ready for review, never as drafts (Alexander, 24 Oct: "extremely annoying that every single PR is opened up as a draft"). The agents' instructions said to open drafts:
And a merge rule (Alexander, 24 Oct): nothing merges into
mainunless he explicitly says so for that merge. While he's away, agents keep working without waiting for merges: stacked PRs ready for review, played and tested on previews and in CI (AGENTS.md).The board automation still works: a ready PR moves its card straight to In review.
Issue
Refs #202
Stack
Merge bottom-up with merge commits; retarget this PR to main once #203 is in.
Verification
python scripts/check_docs.pyclean.