docs: add feature branch hygiene rules for multi-agent workflows#21
Merged
Conversation
Add merge-main bookends (session start + end), draft PR requirement, branch lifetime guidance, and 3 new critical rules to prevent feature branches from diverging and accumulating merge conflicts. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
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
origin/mainbefore implementation (session start) and before final push (session end)gh pr createtogh pr ready(convert existing draft PR)Context
Feature branches in multi-agent workflows were diverging from main over days/weeks, causing all PRs to show DIRTY (conflicted) merge status. These changes ensure branches stay synchronized with main through regular merge-main bookends, and draft PRs provide early warning when conflicts arise.
Test plan
gh pr ready🤖 Generated with Claude Code