Skip to content

Commit f733563

Browse files
docs(claude): update the default branch after a PR merges, before branching
The branch-creation rule only said to pull before `git checkout -b`. After a merge the local default branch lacks the merged commits and the release tags, and branching from origin/<default> instead makes that the new branch's upstream. The rule now covers both and names the repository's own default branch. Refs: RSRMID-3119
1 parent f26260c commit f733563

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

‎CLAUDE.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,11 @@ pnpm run test-demo # demo App against OT&E — needs credentials
7878
`build` (build tooling), `chore`, `docs`, `test`, `refactor`.
7979
- **Breaking changes:** add `BREAKING CHANGE: <summary>` to the commit body after a blank
8080
line, and document the consumer upgrade path in the same change.
81-
- **Branch creation:** `git checkout master && git pull --ff-only` before `git checkout -b`
82-
— never branch from a stale local default branch or another feature branch.
81+
- **Branch creation:** before creating a branch, and again after any PR merges,
82+
run `git checkout master && git pull --ff-only` first — it brings in the
83+
merged commits and their release tags. Never branch from a stale local
84+
`master`, from `origin/master` (it becomes the new branch's upstream) or from
85+
another feature branch.
8386
- **Branch naming:** prefix with the Jira issue ID — `RSRMID-1234-short-description`.
8487
- **Pull requests:** include the Jira issue link in the description; after opening, add the
8588
PR URL as a comment on the Jira issue.

0 commit comments

Comments
 (0)