resolving-merge-conflicts
resolving-merge-conflicts is an agent skill published by tt-a1i. It lives in the tt-a1i/matt-skills-with-to-goal repository, which has 187 GitHub stars and is licensed under MIT; we last read it on 2026-10-26.
Resolves merge conflicts during a git merge or rebase.
Install
skills is a generic installer for any repository of Claude agent skills -- it reads tt-a1i/matt-skills-with-to-goal’s own structure rather than assuming one, the same way this page reads the skill’s own SKILL.md rather than assuming a format.
npx skills add tt-a1i/matt-skills-with-to-goal
Maintenance
Stars
187
State
listed
Licence
MIT
From the repository
Use when you need to resolve an in-progress git merge/rebase conflict.
Common questions about resolving-merge-conflicts
- What does resolving-merge-conflicts do?
- Resolves merge conflicts during a git merge or rebase.
- How do I install resolving-merge-conflicts?
- Run npx skills add tt-a1i/matt-skills-with-to-goal. The skills installer reads the repository’s own structure, so it works for any repository of agent skills.
- Who publishes resolving-merge-conflicts?
- tt-a1i.
- Is resolving-merge-conflicts maintained, and what licence does it use?
- Its repository has 187 GitHub stars and its state in our directory is listed. Its last commit we recorded was on 2026-10-26. The repository declares the MIT licence.