Installs into .claude/skills of the current project.
Are you the author of Resolve Syntax Aware Git Merge Conflicts Before Escalating To Manual Surgery With Mergiraf?
Add the live security badge to your README. It updates with every re-scan.
[](https://www.skillsdirectory.com/skills/agentskillexchange-resolve-syntax-aware-git-merge-conflicts-before-es)
---
name: "Resolve syntax-aware Git merge conflicts before escalating to manual surgery with Mergiraf"
slug: "resolve-syntax-aware-git-merge-conflicts-before-escalating-to-manual-surgery-with-mergiraf"
description: "Use Mergiraf to let an agent attempt tree-aware conflict resolution during merge, rebase, revert, or cherry-pick before falling back to manual edits."
verification: "security_reviewed"
source: "https://codeberg.org/mergiraf/mergiraf"
author: "Mergiraf maintainers"
publisher_type: "open_source_project"
category: "Code Quality & Review"
framework: "Multi-Framework"
---
# 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
- https://mergiraf.org/
## Source
- [Agent Skill Exchange](https://agentskillexchange.com/skills/resolve-syntax-aware-git-merge-conflicts-before-escalating-to-manual-surgery-with-mergiraf/)
