Resolving merge / rebase conflicts seems incorrect

Bug Reports
1

Describe the Bug

It’s great to see Cursor offering a Chat option to resolve git merge / rebase conflicts. LLMs can be very handy at this kind of tedious work. Unfortunately neither claude-4-sonnet (thinking) and gemini-2.5-pro (thinking) provided correct resolution on the first attempt, and they failed in the same way. I think Cursor was not providing the correct instructions for the models to resolve conflicts, and they did much better with follow-up conversation so I believe a better built-in prompt can make the feature a lot more useable.

Steps to Reproduce

  1. Run a git rebase or git merge that would have conflicts
  2. Cursor shows the option to use Chat to resolve conflicts (great!)
  3. Chat works for a while, and resolves conflicts incorrectly: looks the models (tried both claude-4-sonnet (thinking) and gemini-2.5-pro (thinking) resolve conflicts merely by looking at the merge conflict, without looking at recent changes that cause these conflicts

Expected Behavior

In order to properly resolve merge conflicts, the models need to understand where conflicts come from. They should look at the recent history of conflicted files, look at the commits that cause the conflict, and then they should be able to figure out the correct solution.

In my case, I then blamed the models for not looking at recent changes (and then they tried to look for global git log which would never work for giant monorepos, and I had to prompt them to look at git logs of the affected files), and resovling conflicts without understanding the changes. With those, the models managed to run correct commands to obtain context and came up with high quality changes (still not ideal, but much closer and only needed a little tweak to work).

Operating System

MacOS

Current Cursor Version (Menu → About Cursor → Copy)

Version: 1.3.6 (Universal)
VSCode Version: 1.99.3
Commit: 68b8fe7396ea37d8acdaaaa08ba316ba359a4160
Date: 2025-07-30T17:59:33.842Z
Electron: 34.5.1
Chromium: 132.0.6834.210
Node.js: 20.19.0
V8: 13.2.152.41-electron.0
OS: Darwin arm64 24.5.0

Additional Information

Basically I think this issue can be resolved if Cursor provide better instructions for models to resolve conflicts.

Does this stop you from using Cursor

No - Cursor works, but with this issue

2

This topic was automatically closed 22 days after the last reply. New replies are no longer allowed.