Skip to content

docs(claude): update the default branch after a PR merges, before branching #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KaiSchwarz-cnic merged 1 commit into from
Oct 14, 2026
Merged

docs(claude): update the default branch after a PR merges, before branching #407

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,11 @@ pnpm run test-demo # demo App against OT&E — needs credentials
`build` (build tooling), `chore`, `docs`, `test`, `refactor`.
- **Breaking changes:** add `BREAKING CHANGE: <summary>` to the commit body after a blank
line, and document the consumer upgrade path in the same change.
- **Branch creation:** `git checkout master && git pull --ff-only` before `git checkout -b`
— never branch from a stale local default branch or another feature branch.
- **Branch creation:** before creating a branch, and again after any PR merges,
run `git checkout master && git pull --ff-only` first — it brings in the
merged commits and their release tags. Never branch from a stale local
`master`, from `origin/master` (it becomes the new branch's upstream) or from
another feature branch.
- **Branch naming:** prefix with the Jira issue ID — `RSRMID-1234-short-description`.
- **Pull requests:** include the Jira issue link in the description; after opening, add the
PR URL as a comment on the Jira issue.
Expand Down
Loading