AI SkillOther
resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
What is this resource?
Use when you need to resolve an in-progress git merge/rebase conflict.
Review the original project for installation steps, licenses, compatibility and updates. This directory provides discovery links, not downloadable or verified code.
Installation
For repositories supported by the Skills CLI, you can typically start with:
npx skills add aakshintala/switchyardCheck the repository instructions and select the intended skill before installing. This command may not apply to every source.
Safety & attribution
This is an external resource, not independently security-audited by this directory. Inspect permissions, scripts and changes before using it with your files or accounts.