A modern programming language that makes developers happier.

kotlinlang

I noticed that when you merge and get conflicts, while you are resolving them working on a class (with the three view: local, result and remote) if you aren't done with it and you want quickly close it and check some other class, once you close it, you cant open it again: it's gone from the list of conflicted files..

Probably Idea issue tracker is a proper place for this bug report

It also depends on the version of the IDE, as newer ones are better at this, and I believe expose the conflicted files in a listt.