diff --git a/beads_twoclone_test.go b/beads_twoclone_test.go
index f29d7954..a16aea5e 100644
--- a/beads_twoclone_test.go
+++ b/beads_twoclone_test.go
@@ -46,6 +46,8 @@ func TestTwoCloneCollision(t *testing.T) {
 	runCmd(t, cloneA, "./bd", "init", "--quiet", "--prefix", "test")
 	// Enable hash ID mode for collision-free IDs
 	runCmdWithEnv(t, cloneA, map[string]string{"BEADS_NO_DAEMON": "1"}, "./bd", "config", "set", "id_mode", "hash")
+	// Configure git to use merge instead of rebase (sorted JSONL merges cleanly)
+	runCmd(t, cloneA, "git", "config", "pull.rebase", "false")
 	
 	// Commit the initial .beads directory from clone A
 	runCmd(t, cloneA, "git", "add", ".beads")
@@ -61,6 +63,8 @@ func TestTwoCloneCollision(t *testing.T) {
 	runCmd(t, cloneB, "./bd", "init", "--quiet", "--prefix", "test")
 	// Enable hash ID mode (same as clone A)
 	runCmdWithEnv(t, cloneB, map[string]string{"BEADS_NO_DAEMON": "1"}, "./bd", "config", "set", "id_mode", "hash")
+	// Configure git to use merge instead of rebase (sorted JSONL merges cleanly)
+	runCmd(t, cloneB, "git", "config", "pull.rebase", "false")
 
 	// Install git hooks in both clones
 	t.Log("Installing git hooks")