Advanced Semantic Conflict Resolution#75

Merged

OBenner merged 35 commits into

auto-claude/019-advanced-semantic-conflict-resolution

Feb 27, 2026

Commits on Feb 13, 2026

auto-claude: subtask-1-1 - Add scope field to SemanticChange metadata

OBenner
and
claude
committed
auto-claude: subtask-1-2 - Implement scope inference for Python variables

OBenner
and
claude
committed
auto-claude: subtask-1-3 - Add unit tests for scope inference
OBenner
committed
auto-claude: subtask-2-1 - Add FunctionSignature dataclass to types
OBenner
committed
auto-claude: subtask-2-2 - Create signature parser for Python functions
OBenner
committed
auto-claude: subtask-2-3 - Detect signature modifications in conflict detection

OBenner
and
claude
committed
auto-claude: subtask-3-1 - Add RENAME_VARIABLE to ChangeType enum

OBenner
and
claude
committed
auto-claude: subtask-3-2 - Implement rename detection algorithm using AST sim

OBenner
and
claude
committed
auto-claude: subtask-3-3 - Add rename detection to conflict analysis workflow

OBenner
and
claude
committed
auto-claude: subtask-4-1 - Add semantic context to ConflictContext

OBenner
and
claude
committed
auto-claude: subtask-4-2 - Update prompts to include scope and signature info
OBenner
committed
auto-claude: subtask-4-3 - Add explanation request to AI prompt template
OBenner
committed
auto-claude: subtask-5-1 - Add explanation field to MergeResult
OBenner
committed
auto-claude: subtask-5-2 - Parse AI explanation from response
OBenner
committed
auto-claude: subtask-5-3 - Store explanations in analytics
OBenner
committed
auto-claude: subtask-6-1 - Add ResolutionPreview dataclass
OBenner
committed
auto-claude: subtask-6-2 - Implement preview storage in file system
OBenner
committed
auto-claude: subtask-6-3 - Add approval/rejection workflow to AIResolver
OBenner
committed
auto-claude: subtask-7-1 - Add accuracy tracking to ConflictPattern
OBenner
committed
auto-claude: subtask-7-2 - Implement benchmark comparison vs text-only
OBenner
committed
auto-claude: subtask-7-3 - Create E2E test for 40% accuracy improvement

OBenner
and
claude
committed
auto-claude: subtask-8-1 - Update merge workflow to use enhanced semantic ana
OBenner
committed
auto-claude: subtask-8-2 - Create integration test for full semantic merge flow
OBenner
committed
auto-claude: subtask-8-3 - Run all tests and verify acceptance criteria

OBenner
and
claude
committed
docs: Add subtask 8-3 completion summary

OBenner
and
claude
committed

Commits on Feb 25, 2026

chore: untrack .auto-claude/specs/ (already in .gitignore)
OBenner
committed

Commits on Feb 26, 2026

Commits on Feb 27, 2026