with one click
almerge
Resolve merge or rebase conflicts. Investigates both sides, resolves the conflicts (with a special case for lock files), and writes a brief summary.
Resolve merge or rebase conflicts. Investigates both sides, resolves the conflicts (with a special case for lock files), and writes a brief summary.
npx skills add https://github.com/paleo/alignfirst --skill almergeCopy and paste this command into Claude Code to install the skill