Quantcast
Channel: JetBrains Developer Community : All Content - IntelliJ IDEA Users
Viewing all articles
Browse latest Browse all 5481

Merge conflicts broken in 13.0.3 on OS X?

$
0
0

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


Viewing all articles
Browse latest Browse all 5481

Latest Images

Trending Articles



Latest Images