resolve-merge-conflicts

Goal-aware resolution of rebase conflicts when merging a conflict-resolution worktree back into the integration branch. Analyzes the intent of each side of a conflict, resolves it in-place when confid

by TalonT-Org· Repository·other

Run in AgentArea Browse All Skills

Also installable via skills CLI

npx skills add TalonT-Org/AutoSkillit/src/autoskillit/skills_extended/resolve-merge-conflicts

Source

Repo:github.com/TalonT-Org/AutoSkillit

Path:src/autoskillit/skills_extended/resolve-merge-conflicts/SKILL.md(main)

Related in other

agent-memory-yamadashy-repomix

Use this skill when the user asks to save, remember, recall, or organize memories. Triggers on: 'remember this', 'save t...

by yamadashy

21,427

task-execution-engine

CLI tool for configuring and monitoring Claude Code

by davila7

18,218

qiuzhi

指导Claude按照二哥的风格撰写求职类文章，包括公司薪资爆料、年终奖盘点、求职攻略、offer选择建议等内容。

by itwanger

16,619