From e6d6cea9e4ca4fabb5dcdb47f3771ff9f32f4e3b Mon Sep 17 00:00:00 2001 From: AndyMik90 Date: Wed, 17 Dec 2025 10:54:32 +0100 Subject: [PATCH] Refactor merge conflict check to use branch names instead of commit hashes - Updated _check_git_conflicts function to utilize branch names for the merge-tree command, improving clarity and correctness in conflict resolution. --- auto-claude/core/workspace.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/auto-claude/core/workspace.py b/auto-claude/core/workspace.py index cbf09909..6a87973b 100644 --- a/auto-claude/core/workspace.py +++ b/auto-claude/core/workspace.py @@ -519,15 +519,15 @@ def _check_git_conflicts(project_dir: Path, spec_name: str) -> dict: spec_commit = spec_commit_result.stdout.strip() # Use git merge-tree to check for conflicts WITHOUT touching working directory + # Note: --write-tree mode only accepts 2 branches (it auto-finds the merge base) merge_tree_result = subprocess.run( [ "git", "merge-tree", "--write-tree", "--no-messages", - merge_base, - main_commit, - spec_commit, + result["base_branch"], # Use branch names, not commit hashes + spec_branch, ], cwd=project_dir, capture_output=True,