Skip to content

Commit e794f2c

Browse files
docs: add branching workflow guidelines
Document that new branches must always be created from master, not from feature branches. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: JasonXuDeveloper - 傑 <jason@xgamedev.net>
1 parent 3b89208 commit e794f2c

File tree

1 file changed

+22
-1
lines changed

1 file changed

+22
-1
lines changed

.claude/rules/commit-conventions.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,25 @@
1-
# Commit Message Format
1+
# Git Workflow & Commit Conventions
2+
3+
## Branching
4+
5+
**Always create new branches from `master`** (the main branch), not from feature branches:
6+
7+
```bash
8+
# Correct workflow
9+
git checkout master
10+
git pull origin master
11+
git checkout -b fix/my-fix
12+
13+
# Wrong - creates branch from current branch which may not be master
14+
git checkout -b fix/my-fix
15+
```
16+
17+
Before creating a PR branch, always:
18+
1. Switch to `master`
19+
2. Pull latest changes
20+
3. Then create the new branch
21+
22+
## Commit Message Format
223

324
All commits should follow the Conventional Commits specification to enable automatic changelog generation.
425

0 commit comments

Comments
 (0)