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.