Skip to content

docs: document merge-method rule and broken-link caveat in CLAUDE.md#192

Merged
ecunado merged 1 commit into
devfrom
docs/merge-method-guidance
Jun 30, 2026
Merged

docs: document merge-method rule and broken-link caveat in CLAUDE.md#192
ecunado merged 1 commit into
devfrom
docs/merge-method-guidance

Conversation

@ecunado

@ecunado ecunado commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

Adds guidance to CLAUDE.md to prevent the two issues we just hit:

  1. Merge method per branchfeature → dev uses squash; dev → main must 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 a dev → main PR was accidentally squashed.

  2. Broken-link caveat — the build uses onBrokenMarkdownLinks: 'throw', so intra-plugin links must be relative to the plugin (restobjects.md#anchor, not restapi/restobjects.md#anchor). Run yarn build locally before a prod deploy.

All instructions in English.

@ecunado ecunado merged commit 36391e3 into dev Jun 30, 2026
2 checks passed
@ecunado ecunado deleted the docs/merge-method-guidance branch June 30, 2026 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants