When updating a branch in CVS with code from the head I'm doing this with the Update Directory dialogue. Unfortunately all non-conflicting changes from the head are applied in this way without asking.
In Eclipse it is possible to selectively mark which changes and files should be merged. Has IntelliJ IDEA such a functionality as well?
Unfortunately there is no such thing as Eclipe's Synchronize View in IntelliJ. You've got to use the Update Directory dialogue.