diff --git a/CLAUDE.md b/CLAUDE.md
index f82e14f0..c88f411b 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -4,6 +4,7 @@
 
 - Use conventional commit prefixes (feat:, fix:, chore:, refactor:, test:, docs:, style:)
 - Suggest a branch name before starting any code changes
+- Always rebase on origin/main before creating a new branch or opening a PR
 
 ## General