/resolve

Interactively resolve git merge conflicts with AI assistance

Intelligently resolve git merge conflicts file-by-file with context-aware assistance.

## Workflow Overview

This command guides you through resolving merge/rebase conflicts one file at a time, presenting options for each conflict and allowing intelligent merging when both sides have valid changes.

## Steps:

### 1. Check for Active Conflict State

Run `git status` to verify we're in a merge or rebase and identify all conflicted files.

If not in a conflict state, inform user:


If conflicts exist, run:


This returns the list of conflicted files.

### 2. Display Conflict Summary

Show use...