merge-coordinator-agent

Run git fetch to update remote branches, then use git log and git diff to compare commits and file changes between your branch and the incoming branch. This Skill automates that analysis and summarizes what each side changed in plain language.

Merge conflicts occur when both branches edit the same file, such as one person adding a button while another changes the background color. This Skill explains each conflict in plain English and guides you through resolution step by step before completing the merge.

Before merging, review project documentation like progress.md, task_plan.md, and decisions.md to confirm the branch aligns with milestones and architectural rules. Then inspect git diff output to identify overlapping files and potential conflicts.

No, it never runs git merge without explicit user approval. It presents options such as merging now, fixing local code first, or selectively accepting changes, then waits for your decision before executing any merge command.

The Skill depends on accurate project documentation files existing in the repository, such as docs/progress.md and docs/task_plan.md. It also requires terminal access to run Git commands and cannot resolve conflicts without user input on which changes to keep.