ljweel
January 17, 2026, 11:02am
1
Cursor IDE
Conflict Display Bug
After resolving a Git merge conflict and completing the commit, Cursor IDE still displays the files as having conflicts, even though the conflict has been resolved.
After resolving the conflict and committing, the conflict indicator should disappear in Cursor IDE.
Windows 10/11
OS: Windows 11 25H2 (WSL2 Ubuntu 22.04)
auto mode
열림 10:51AM - 17 Jan 26 UTC
NOTE: We will try our best to check Github Issues, but [forum.cursor.com](https:… //forum.cursor.com/) is our main site for bug reports / user feedback. We'd recommend you post there for the fastest response.
# Cursor IDE - Conflict Display Bug Report
## Problem Description
After resolving a Git merge conflict and completing the commit, Cursor IDE still displays the files as having conflicts, even though the conflict has been resolved.
## Steps to Reproduce
1. Merge conflict occurs in `package.json` and `package-lock.json` files
2. Manually resolve the conflict (remove conflict markers)
3. Run `git add package.json package-lock.json`
4. Run `git commit` to complete the merge
5. Check Cursor IDE - it still displays the files as having conflicts
## Expected Behavior
After resolving the conflict and committing, the conflict indicator should disappear in Cursor IDE.
## Actual Behavior
Cursor IDE continues to display the files as having conflicts even after the commit.
## Verified Information
- ✅ `git status` shows no conflicts
- ✅ File contents verified: no conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`) present
- ✅ Both `package.json` and `package-lock.json` are valid JSON files
- ✅ Git local repository status: normal (conflict resolved)
## Environment Information
- **OS**: Windows 11 25H2 (WSL2 Ubuntu 22.04)
- **Cursor Version**: 2.3.34
- **Git Version**: 2.34.1
- **Working Directory**: WSL2 environment (`/home/leejw/projects/OnPyRunner`)
## Additional Information
This appears to be a UI state update issue in Cursor IDE. The Git repository itself is in a normal state with conflicts properly resolved.
<img width="508" height="327" alt="Image" src="https://github.com/user-attachments/assets/2a35249a-638f-4d19-9a1e-e184ba4866a5" />
<img width="251" height="118" alt="Image" src="https://github.com/user-attachments/assets/f2f3620e-1294-4688-a245-7d770208b055" />
I also wrote about it on GitHub issues.
No - Cursor works, but with this issue
ljweel
January 17, 2026, 11:13am
4
I solve this problem with this post
[Captura de pantalla 2025-11-05 a la(s) 9.12.52 a.m..png]
thanks
system
February 8, 2026, 11:13am
5
This topic was automatically closed 22 days after the last reply. New replies are no longer allowed.
