Use when you need to resolve an in-progress git merge/rebase conflict.
79%
Does it follow best practices?
Run evals on this skill
Adds up to 20 points to the overall score
Low
Low-risk findings worth noting
Fix and improve this skill with Tessl
tessl review fix ./.agents/skills/resolving-merge-conflicts/SKILL.mdThe canonical home for this skill is resolving-merge-conflicts in YoizenSA/dev-ai-workflow
The skill exposes the agent to untrusted, user-generated content from public third-party sources, creating a risk of indirect prompt injection. This includes browsing arbitrary URLs, reading social media posts or forum comments, and analyzing content from unknown websites.
The workflow instructs the agent to check PRs and issues/tickets during conflict resolution, which exposes the agent to outsider-authored free text from external contributions.
tonykay/transcriber
a5b30bf
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.