Git Merge Conflict Resolver for AI-DLC Projects

Resolve git merge conflicts that arise when multiple developers work on different AI-DLC units in parallel during the CONSTRUCTION phase.

When This Happens

After INCEPTION phase completes, the project is split into units. Multiple developers clone the repo and each runs CONSTRUCTION on their assigned unit. When they push/merge back:

1. State file conflicts — aidlc-docs/aidlc-state.md and aidlc-docs/audit.md are modified by every developer since each tracks their own unit's progress
2. Code conflicts — shared/common units modified by one developer conflict with another developer's changes or dependencies on that shared code

Conflict Resolution Workflow

Step 1: Detect and Classify Conflicts

Run git status to identify conflicted files, then classify each: