docs: document merge-method rule and broken-link caveat in CLAUDE.md#192
Merged
Conversation
cmg91
approved these changes
Jun 30, 2026
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.
Adds guidance to
CLAUDE.mdto prevent the two issues we just hit:Merge method per branch —
feature → devuses squash;dev → mainmust use a merge commit (never squash), so the long-lived branches keep shared history and don't produce phantom conflicts. Includes the recovery steps if adev → mainPR was accidentally squashed.Broken-link caveat — the build uses
onBrokenMarkdownLinks: 'throw', so intra-plugin links must be relative to the plugin (restobjects.md#anchor, notrestapi/restobjects.md#anchor). Runyarn buildlocally before a prod deploy.All instructions in English.