Add pull-before-merge rule to CLAUDE.md
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -6,6 +6,7 @@
|
|||||||
- Merge flow: `feature/*` → `develop` → `main`.
|
- Merge flow: `feature/*` → `develop` → `main`.
|
||||||
- **Squash merge** `feature/*` into `develop` (one clean commit per feature).
|
- **Squash merge** `feature/*` into `develop` (one clean commit per feature).
|
||||||
- **Merge commit** `develop` into `main` (marks deploy points).
|
- **Merge commit** `develop` into `main` (marks deploy points).
|
||||||
|
- Always `git pull` the target branch before merging into it.
|
||||||
|
|
||||||
# Instructions
|
# Instructions
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user