Clarify: adopted plugin branches must not merge master-forge into themselves - #349
Merged
Merged
Conversation
…mselves A branch adopted per "When a plugin's fork stops being a reliable source of truth" should only ever sync with master. Merging master-forge into it to pre-resolve the <modules>-list conflict has the same effect as forking master-forge outright — every other plugin's tree ends up permanently on the branch — just reached via a merge commit instead of a clone. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
4 tasks
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
CONTRIBUTING.md's branch-adoption section: an adopted plugin branch should only ever sync withmaster, never havemaster-forgemerged into it.master-forgeinto an adopted branch to pre-resolve the<modules>-list conflict has the same effect as forkingmaster-forgeoutright (which the doc already forbids) — every other plugin's tree ends up permanently on the branch, just via a merge commit instead of a clone. Caught before it was pushed for real, but the doc didn't call this specific case out.Test plan
🤖 Generated with Claude Code