From 8e6462d44cb3dc0fa0947c53ad72119ae84c3a67 Mon Sep 17 00:00:00 2001
From: Steve Yegge <steve.yegge@gmail.com>
Date: Thu, 18 Dec 2025 23:24:31 -0800
Subject: [PATCH] test(merge): add test for both sides adding same dependency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ensures no duplicates when left and right independently add the same
dependency (not in base). Left version is preferred.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 internal/merge/merge_test.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/internal/merge/merge_test.go b/internal/merge/merge_test.go
index 3d71a4dc..b688ea49 100644
--- a/internal/merge/merge_test.go
+++ b/internal/merge/merge_test.go
@@ -180,6 +180,19 @@ func TestMergeDependencies(t *testing.T) {
 				{IssueID: "bd-1", DependsOnID: "bd-3", Type: "related", CreatedAt: "2024-01-01T00:00:00Z"},
 			},
 		},
+		{
+			name: "both add same dep (not in base) - no duplicates",
+			base: []Dependency{},
+			left: []Dependency{
+				{IssueID: "bd-1", DependsOnID: "bd-2", Type: "blocks", CreatedAt: "2024-01-01T00:00:00Z"},
+			},
+			right: []Dependency{
+				{IssueID: "bd-1", DependsOnID: "bd-2", Type: "blocks", CreatedAt: "2024-01-02T00:00:00Z"},
+			},
+			expected: []Dependency{
+				{IssueID: "bd-1", DependsOnID: "bd-2", Type: "blocks", CreatedAt: "2024-01-01T00:00:00Z"}, // Left preferred
+			},
+		},
 		{
 			name: "left removes dep from base - REMOVAL WINS",
 			base: []Dependency{