Merge Resolver

Resolve git merge conflicts without the headache. Reads your conflicted files and picks the right resolution based on context from both branches.

Usage

npx ai-merge-resolve [file]

Examples

# Resolve conflicts in a specific file
npx ai-merge-resolve src/index.ts

# Resolve all conflicts in the repo
npx ai-merge-resolve