Does anyone else use IDEA to merge from one branch into another?
I'm finding some weird behavoir. For example, in both the "Local Changes" and "Last Version" panes, I'm seeing CVS conflict marks like so:
Especially in the "Local Change" pane, occassionally at the end of the file I'll see:
Most certainly neither of these marks appear in the source code.
I love IDEA, but with CVS operations like this, I'm finding it wholly inadequete.