---
name: resolve-merge-conflicts
description: Guide for resolving merge conflicts in Git. Use when asked to resolve merge conflicts. 
---

## Assert that you are in the middle of a merge conflict

If you find that when you look at the Git stage, it does not appear that you're in the middle of a merge conflict, then exit. 

## Resolve the merge conflicts

Resolve the merge conflicts. All of them that you see in the current working directory. 

## Create summary 

Create a file in /tmp/ that gives me an overview of the merge conflicts. 

For each conflict, give me the code snippet for the conflict, give the code after the resolution, and give a short description of the solution that you came up with. 

All of it with the goal that I can review the resolutions and catch mistakes.