Files are red even after resolving conflicts

[ml-mave]

The Git Scope window doesn't seem to refresh file conflict status properly. Files remain red even after resolving conflicts.

[hoxi]

Does this happen every time, or is it sporadic?

[ml-mave]

I haven't tested extensively, but it seems to happen every time.

[hoxi]

The next 2026.1 version will have several core parts rewritten, avoiding some internal INtelliJ APIs that has caused conflicts with core IDE functionality. Let's see if this issue persists after releasing the 2026.1 version.

[hoxi]

I was not really able to reproduce this issue, but please test the new 2026.1 release since this version will avoid the internal IntelliJ API that caused unwanted side-effects in this area. Please try again and report back if you still see this issue.

[hoxi]

I’m planning to close this issue since I haven’t heard anything back. If you still see this issue in 2026.1.x, just comment or reopen.

[ml-mave]

I got this again in a real branch after a rebase but I wasn't able to reproduce this when trying with a minimal single-file branch. So there's definitely something going on but it's not obvious what's required to trigger it.

Feel free to reopen (I can't reopen this myself, it says no permissions).

[hoxi]

I have seen sometimes that the Git Scope window does not update properly when git operations modify the repo. So this is maybe more of a generic issue, not only isolated to updates from resolving a conflict. I rely on IntelliJ hooks here to notify when there are updates; so there might be something there in that integration. I will try to look into this, even though it is very sporadic.