From 2e151acc0eb7abe2a877b2fbe31261fda02d0427 Mon Sep 17 00:00:00 2001
From: AndyMik90 <andre@mikalsenutvikling.no>
Date: Tue, 16 Dec 2025 15:19:35 +0100
Subject: [PATCH] Update parallel merge conflict resolution metrics in
 workspace.py

- Changed the key for tracking parallel AI merges from a boolean to an integer count of files needing AI merge.
- This adjustment enhances clarity in reporting the number of files involved in parallel AI merge operations.
---
 auto-claude/workspace.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/auto-claude/workspace.py b/auto-claude/workspace.py
index 20de71c3..3a9baf78 100644
--- a/auto-claude/workspace.py
+++ b/auto-claude/workspace.py
@@ -1379,7 +1379,7 @@ def _resolve_git_conflicts_with_ai(
             "conflicts_resolved": len(conflicting_files),
             "ai_assisted": ai_merged_count,
             "auto_merged": auto_merged_count,
-            "parallel": len(files_needing_ai_merge) > 1,
+            "parallel_ai_merges": len(files_needing_ai_merge),
         },
     }