# Resolve Merge Conflicts

Handle merge conflicts with AI assistance.

<!-- TODO: This document is a skeleton. Fill in the sections below. -->

## Overview

<!-- TODO: When conflicts occur and how erk handles them -->

## Auto-Restack

<!-- TODO: erk pr auto-restack --dangerous -->

## How Conflict Resolution Works

<!-- TODO: What happens when conflicts are detected -->

## Manual Resolution

<!-- TODO: /erk:fix-conflicts command -->

## Understanding Stack Conflicts

<!-- TODO: How conflicts propagate through stacks -->

## Best Practices

<!-- TODO: Tips for minimizing and handling conflicts -->

## See Also

- [Graphite Integration](../tutorials/graphite-integration.md) - Understanding stacks
- [Graphite Issues](../faq/graphite-issues.md) - Troubleshooting
