在使用 Mergiraf 进行手动修复之前，请先解决语法感知的 Git 合并冲突

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

• https://mergiraf.org/