Cursor home page
Search...
⌘K
Ask AI
Sign in
Download
Download
Search...
Navigation
Git
AI Resolve Conflicts
Documentation
Guides
Tools
Website
Forum
Support
Get Started
Welcome
Installation
Quickstart
Concepts
Core
Tab
Agent
Background Agents
Web & Mobile
Inline Edit
Rules
Memories
Context
Codebase Indexing
Ignore files
Model Context Protocol (MCP)
@ Symbols
Integrations
Bugbot (Code Review)
Slack
Git
AI Commit Message
AI Resolve Conflicts
Models
Models
API Keys
Configuration
Keyboard Shortcuts
Themes
Shell Commands
Account
Pricing
Billing
Update Access
Teams
Troubleshooting
Common Issues
Getting a Request ID
Troubleshooting Guide
On this page
How to use
Integrations
Git
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
Was this page helpful?
Yes
No
AI Commit Message
Models
Assistant
Responses are generated using AI and may contain mistakes.