Merge conflicts broken in 13.0.3 on OS X?

Hi,

I just updated to IDEA 13.0.3 (133.1122) on OS X 10.9.2. With this new version I tried to resolve Git merge conflicts as usual. Unfortunately after resolving all conflicts in one file, der merge dialog stayed open, can't be closed, the "overview" dialog (that shows all files with conflicts) didn't respond to clicks and I could not close IDEA but had to do a "hard quit".

Can anyone reproduce? Is this a bug of 13.0.3? It worked fine with 13.0.2.

Regards
Stefan

2 comments
Comment actions Permalink

Hello Stefan,

Try to disable "ide.mac.message.dialogs.as.sheets" in <Your App Installation>/bin/idea.properties.
Additional information about changing IDEA properties could be found here: https://intellij-support.jetbrains.com/entries/23395793.

0
Comment actions Permalink

This solves the problem. Thanks. But now I will switch to 13.1 ...

0

Please sign in to leave a comment.