Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
55
61%
Does it follow best practices?
Impact
—
No eval scenarios have been run
Passed
No known issues
Optimize this skill with Tessl
npx tessl skill review --optimize ./cursor-team-kit/skills/fix-merge-conflicts/SKILL.mdLoading evals
b8f2564
If you maintain this skill, you can claim it as your own. Once claimed, you can manage eval scenarios, bundle related skills, attach documentation or rules, and ensure cross-agent compatibility.