merge-agent-work

Merge agent work using a `--no-ff` merge from the agent branch to the task branch, which preserves agent history and creates a merge commit. This Skill automates the process, verifies agent completion, detects conflicts, and updates task state tracking to ensure safe integration.

The merge process detects conflicts, confirms merge commit creation, and optionally validates the build and tests after merging. It also verifies the agent has completed its work before attempting the merge and updates task.json to reflect the merged state.

Use this approach when coordinating multiple agent merges, when agents are marked as completed in status.json, and when you need validation for merge integrity and optional build verification. It prevents conflicts and broken builds during multi-agent workflows.

Yes, this Skill is applicable when coordinating multiple agent merges. Run it for each agent sequentially to integrate their contributions safely, with state tracking and conflict detection ensuring each merge completes successfully before proceeding to the next.

The Skill detects conflicts during the merge operation and reports them. You can then resolve conflicts manually before proceeding, ensuring merge integrity before updating task state and running optional build validation.

The agent must have completed its work (status.json shows 'completed'), and both the agent branch and task branch must exist in your worktree. The Skill switches to the task worktree and performs the merge with validation and state updates.