From b610f7ad66995424a968f7c7be26c1f6608b162f Mon Sep 17 00:00:00 2001
From: Edward Langley <el-github@elangley.org>
Date: Wed, 8 Apr 2026 23:59:07 -0700
Subject: [PATCH] chore: update CLAUDe.md

---
 CLAUDE.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index 278ef18..aab78f2 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -6,6 +6,7 @@
   from logic
 - context/repo-map.md is your "road map" for the repository. use it to reduce exploration and keep it updated.
 - context/design-principles.md is also important for keeping the repository consistent.
+- prefer merges to rebasing.
 
 <!-- BEGIN BEADS INTEGRATION v:1 profile:minimal hash:ca08a54f -->
 ## Beads Issue Tracker
@@ -38,7 +39,7 @@ bd close <id>         # Complete work
 3. **Update issue status** - Close finished work, update in-progress items
 4. **PUSH TO REMOTE** - This is MANDATORY:
    ```bash
-   git pull --rebase
+   git merge origin/main
    bd dolt push
    git push
    git status  # MUST show "up to date with origin"