Hi there

Am I the only one who thinks that the compare in IntelliJ is producing really funny results? The other day I was gonna merge 2 files - one locally and one from SVN. The files from SVN had program version pre8, the one locally had pre7. IntelliJ said it should be pre6 !! Is there any settings that can be set so it suggests the latest revision and not some funny non existing revision ?


1 comment
Comment actions Permalink

I also got some strange auto-merging that didn't seem to correctly give priority to my local changes.  IDEA merging used to be spot-on, but it appears to be buggy now.


Please sign in to leave a comment.