docs: expand multi-agent and stacked PR guides#60
Merged
xirong merged 1 commit intoJun 11, 2026
Conversation
Add executable workflows for comparing, integrating, and cleaning up agent branches, native Git commands and Graphite CLI usage for PR stacks, and record the v2.1.0 scope in the roadmaps. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
xirong
added a commit
that referenced
this pull request
Jun 11, 2026
PRs #58, #59, and #60 were merged into their stacked base branches before those branches were retargeted to master. This merge brings the aggregated content of all three onto master. * origin/ai/repo-agent-conventions: docs(ai-native): expand multi-agent and stacked PR guides docs: adopt agent conventions for this repository docs(templates): add AGENTS.md template
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
1 participant
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.
Summary
PR 4 of 4 in the v2.1.0 stack. Merge last.
Expands two guides from principle lists into executable workflows:
multi-agent-branch-strategy.md(zh + en): comparing experiment branches (git diff main...,git range-diff), integrating the winning solution (cherry-pick by commit or by file), an ordered procedure for same-file collisions, and cleanup of losing branches (archive tag, branch, worktree, remote)stacked-pr-for-ai-generated-changes.md(zh + en): operating a stack with native Git (gh pr create --base,git rebase --update-refs,git rebase --ontoafter the base merges,--force-with-leaserisk note) and Graphite CLI core commandsROADMAP.mdand00-meta/roadmap.mdAI involvement
git rebase --onto main pr-1sequence in section 5, since readers will copy it verbatimVerification
python3 scripts/check-docs.pypassespython3 scripts/check-links.py --no-externalpasses🤖 Generated with Claude Code