Fix Merge Conflicts

Resolve an active git merge with unmerged paths by inspecting conflicts, staging intentional resolutions, and continuing non-interactively with safe CI-marker merge-message handling. Use this skill when asked to fix or continue merge conflicts; not for rebases, cherry-picks, dirty worktrees, CI failures, or PR monitoring.

willakins Updated 1 repo stars
SkillSyncer dashboard showing shared and device skills

File contents

willakins/SkillSyncer commit 7527e45698

Frequently asked questions

npx get-skill add willakins/fix-merge-conflicts