mend
About mend
Resolve an in-progress git merge, rebase, cherry-pick, or revert that has conflict markers or unmerged paths, or merge a pull request's base into that pull request's branch and resolve what conflicts, from any checkout. Use when asked to mend, resolve merge conflicts, fix rebase conflicts, finish a conflicted rebase or cherry-pick, resolve the conflicts on this PR, my PR has conflicts, merge main into this branch, bring this branch up to date, /mend, or /resolve-merge-conflicts.
Install
Copy the command and run it in a terminal.
$
npx skills add https:/ / frankieramirez/ mana --skill mendAfter installing, type/mendin Claude Code to confirm it loaded.
Bundled files
References and scripts installed along with SKILL.md.
references/archmage.mdchecks.mdpr-target.mdsources.mdweaver.mdscripts/conflict-stateprepare-pr.shComments
Markdown supported