conflicts
Resolve git merge conflicts by analyzing change intent across branches. Use when the user asks to resolve merge conflicts, sync a branch, merge branches, or when a git merge produces conflicts.
64
Quality
76%
Does it follow best practices?
Impact
—
No eval scenarios have been run
Securityby
Passed
No known issues
Optimize this skill with Tessl
npx tessl skill review --optimize ./plugins/conflicts/skills/conflicts/SKILL.mdLoading evals
- Repository
- mattermost/mattermost-ai-marketplace
- Commit
349d5ed
Is this your skill?
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.