Self-hosted alternatives to resolving-merge-conflicts

R

resolving-merge-conflicts

Resolve an in-progress git merge/rebase conflict

resolving-merge-conflicts is an agent skill from Matt Pocock's skills collection, listed on skills.sh. It resolves an in-progress git merge or rebase: it reads why each side changed, keeps both intents where it can, runs the project's checks, and finishes the merge without aborting. A skill is a SKILL.md file of instructions (sometimes with scripts and reference notes) that an AI agent loads only when a task calls for it, so the agent knows the steps to follow and what to avoid. It is free and open source.