and if it doesn't do what you want, I suggest writing a feature request. I have gotten quite a few features this way.
You can choose specific files to commit or update in IDEA too, but I guess that's no good either if it doesn't happen exactly where you want it to.
Why do you want a visual merge even when there are no conflicts though? You could just edit out everything that shouldn't be committed, and then commit.
Having said that, I'm way less disciplined than I used to be, so I've gotten so I just trust the merge. The mentors who taught me the ropes with version control systems would not be impressed.
Or maybe they've also realized it's not 1992 anymore.
If you're just developing a web application or twitter client, it's probably not worth being so anal-retentive about it.
I'm not asking for a visual merge "when there are conflicts". I'm asking for a visual merge NOW; because I said so. Because if it fails to produce the said visual merge, it gets thrown off the window - exactly what's happened.
And it's more than visual merge; I also want a tree of files that have been changed, on both sides; and I want to look at diffs when clicking on them; and to choose what to update, what to commit. It's very much more than just a dumb commit all/update.
Nope, those people on ##java are really passionate about IDEA.