AI Resolve Conflicts
Let Agent help resolve Git merge conflicts automatically
When merge conflicts occur, Cursor Agent can help resolve them by understanding both sides of the conflict and proposing a resolution.
How to use
- When a merge conflict occurs, you’ll see the conflict markers in your file
- Click the Resolve in Chat button that appears in the merge conflict UI
- Agent will analyze both versions and suggest a resolution
- Review the proposed changes and apply them
AI Resolve Conflicts
Let Agent help resolve Git merge conflicts automatically
When merge conflicts occur, Cursor Agent can help resolve them by understanding both sides of the conflict and proposing a resolution.
How to use
- When a merge conflict occurs, you’ll see the conflict markers in your file
- Click the Resolve in Chat button that appears in the merge conflict UI
- Agent will analyze both versions and suggest a resolution
- Review the proposed changes and apply them