---
title: "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: "listed"
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

Choose whichever fits your setup:

1. Copy this skill folder into your local skills directory.
2. Clone the repo and symlink or copy the skill into your agent workspace.
3. Add the repo as a git submodule if you manage shared skills centrally.
4. Install it through your internal provisioning or packaging workflow.
5. Download the folder directly from GitHub and place it in your skills collection.

Install command or upstream instructions:

```
Follow the installation page at mergiraf.org, then configure Git to use Mergiraf as the merge driver or invoke it manually after a conflict appears.
```

## 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/)