Describe the Bug
Cannot commit changes to the project due to unresolved merge conflicts. Git indicates there are merge conflicts, but when trying to resolve them, the conflicted file cannot be opened because it doesn’t exist physically.
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use ‘git add/rm ’
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
Specific File Issue:
Conflicted file: .cursor/mcp.json
Error when trying to open: “The editor could not be opened because the file was not found.”
Git status shows: File in unmerged state
Physical reality: File doesn’t exist in the filesystem
Current Git State:
Repository has unmerged files preventing commits
Pull operations fail due to conflicts
File .cursor/mcp.json appears in git index but not in working directory
Multiple commit hashes involved in the conflict
Steps to Reproduce
I dont’ even know
Expected Behavior
I want to commit my project or go back to an anterior chekpoint
Screenshots / Screen Recordings
Operating System
Windows 10/11
Current Cursor Version (Menu → About Cursor → Copy)
Version: 0.42.4
VSCode Version: 1.95.3
Commit: f1a4fb101478ce6ec86vscode2024
Does this stop you from using Cursor
No - Cursor works, but with this issue