CtrlK
BlogDocsLog inGet started
Tessl Logo
SkillPublic

git-resolve-conflicts

Resolve unmerged paths from a pending merge, rebase, cherry-pick, or stash pop, then continue the operation and commit. Use when invoked as `$git-resolve-conflicts` or when the user asks to resolve conflicts and commit.

Quality

92%

Does it follow best practices?

Run evals on this skill

Adds up to 20 points to the overall score

View guide
SecuritybySnyk

Passed

No findings from the security scan

SKILL.md
Quality
Evals
Security

No evaluations available

This skill hasn't been evaluated yet

Log in to request
tessl scenario generate
tessl eval run
Read the evals guide
Repository

phatblat/dotfiles

Path

.agents/skills/git-resolve-conflicts/SKILL.md

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.