Resolve syntax-aware Git merge conflicts before escalating to manual surgery with Mergiraf

Use Mergiraf to let an agent attempt tree-aware conflict resolution during merge, rebase, revert, or cherry-pick before falling back to manual edits.

agentskillexchange Updated 28 repo stars

File contents

Resolve syntax-aware Git merge conflicts before escalating to manual surgery with Mergiraf

Use Mergiraf to let an agent attempt tree-aware conflict resolution during merge, rebase, revert, or cherry-pick before falling back to manual edits.

Prerequisites

Mergiraf, Git

Installation

Use the upstream install or setup path that matches your environment:

  • Cargo.lock
  • Cargo.toml

Requirements and caveats from upstream:

  • This website requires JavaScript.

Basic usage or getting-started notes:

  • chore(helpers/run.sh): clean-up ( #714 )

  • .envrc.example

  • feat: convert the committed .envrc to an example, with contribution instructions ( #711 )

  • Source: https://codeberg.org/mergiraf/mergiraf

Documentation

Source

agentskillexchange/skills/tree/main/skills/resolve-syntax-aware-git-merge-conflicts-before-escalating-to-manual-surgery-with-mergiraf commit b77f999873

Frequently asked questions

npx skillmds@latest add agentskillexchange/resolve-syntax-aware-git-merge-conflicts-before-escalating-t