What problem does it solve? After a Git merge or rebase, conflict markers appear across knowledge base files like rule indexes, skill definitions, and documentation. Manually reconciling these is error-prone, and blindly auto-merging implementation code or dependency files can silently break runtime behavior. ## Core Features & Use Cases - Category-based conflict handling: Classifies conflicted files into documentation indexes, overview rules, module rules, skills, and explanatory docs that can be auto-merged, versus implementation source, behavior-changing config, and dependency metadata that require user confirmation. - Structured merge strategies: Applies union-merge for index table rows, preserves unique constraints from both sides in rules, deduplicates paths, and removes all conflict markers without residue. - Optional sub-agent orchestration: When enabled, a sub-agent produces a five-field comparison table (file, category, ours_summary, theirs_summary, recommendation) while the main agent handles writes and acceptance. - Use Case: After rebasing a branch that touched both .cursor/rules files and service code, run this skill to auto-merge the rule and index conflicts, then review a side-by-side summary of the implementation conflicts before choosing which side to keep. ## Quick Start Ask the assistant to resolve the merge conflicts in the workspace context files, optionally listing specific conflicted files to limit the scope.
