What problem does it solve? When multiple delegated coding tasks run in parallel worktrees, merging their outputs back together produces Git conflict markers that must be resolved without losing the intent of either parallel feature. Manual resolution is error-prone and can silently break one of the merged changes. ## Core Features & Use Cases - Conflict Detection: Scans the current working directory to find every file containing conflict markers (<<<<<<< HEAD). - Semantic Merging: Analyzes both conflicting versions logically and integrates them so the semantics of both parallel features are preserved, rather than picking one side. - Verification: Runs the linter and/or a basic build after resolution to confirm the merged code did not break syntax. - Use Case: After dispatching two Executor tasks in parallel git worktrees, merging their branches produces conflicts in shared files; this skill resolves each conflict while keeping both features intact and validates the result with a build. ## Quick Start Resolve all merge conflicts in the current working directory left by the parallel Executor tasks, preserving both features, then run the linter to verify.
