I'm really enjoying PHPStorm so far. Just have one issue:
We use .class files for PHP classes. When updating from SVN, .class files that have conflicts are not able to merge/edit conflicts. PHPStorm thinks these files are binary - I assume based on Java .class files. Is there any way to specify .class files as regular PHP so that merging will work? Right now, I only have options to "Accept theirs" or "Accept mine".
Thanks in advance,