Merge Conflicts
Resolve merge conflicts on a pull request by merging the target branch into the source branch and fixing conflicts. Use when a PR has merge conflicts, a branch needs to be updated, or when asked to fix conflicts. Triggers on: fix merge conflicts, resolve conflicts, merge conflicts on PR, update branch, rebase PR.
Toolkit Path
skills/merge-conflicts/SKILL.mdTrigger Phrases
Say any of these phrases to load this skill.
Related Workflow Skills
Adhoc Workflow
Ad-hoc mode workflow for Builder. Use when handling direct requests without a PRD, quick fixes, or one-off tasks. Triggers on: ad-hoc mode, quick fix, direct request, one-off task.
Multi Session
Multi-session coordination for parallel AI sessions. Provides session locks, lazy heartbeat, and merge queue management. Loaded conditionally when multiple sessions are detected.
Post Completion
Post-completion polish steps for Developer. Use when all PRD stories pass but before declaring COMPLETE. Triggers on: post-completion, polish, aesthetic review, post-change actions, final checks.