Somewhere else…
When I solve merge conflicts, sometimes the file still show that there still are merge conflicts.
Merge files, solve conflicts, file still appear to has merge conflicts
MacOS
Version: 2.0.43 (Universal)
No - Cursor works, but with this issue
deanrie
November 6, 2025, 11:24am
2
Hey, thanks for the report. I can see the file content is clean with no conflict markers (<<<<<<<, =======, >>>>>>>), but Cursor still shows the “Resolve in Chat” and “Resolve in Merge Editor” buttons at the bottom.
This confirms it’s a UI state issue. Here are steps to fix it:
Stage the file manually - sometimes the conflict state won’t clear until the file is staged:
git add database/migrations/2025_10_21_092020_add_whatsapp_video_to_psychology_consultation_communication_channels.php
Check git status - run this in your terminal to see if git still thinks there are conflicts:
git status
If git status shows it’s resolved, refresh Cursor:
Reload window: CMD+Shift+P → “Developer: Reload Window”
Or restart Cursor
If it still persists after staging and reloading, there might be a git index issue. Try:
git diff --check
This will show if there are any remaining conflict markers git detects.
Let me know what git status shows and whether staging clears the UI state.
annaf
November 5, 2025, 4:29pm
3
Cursor IDE
There’s no way to resolve merge conflicts starting today. The button to mark as resolved disappeared
Try to fix a merge conflict in the IDE
MacOS
the latest. I just updated
Yes - Cursor is unusable
