for example, when the multiple checkouts are allowed, and 2 users check out not-exclusively and modify the same file, then on commit invocation from IDEA for file modified both locally and on server either the automerge is done by vss (if there are no conflicting changes; in this case the warning is displayed), or the file gets the conflict markers in code (>>>>) that should be edited manually.
This is ok, but it would be nice to get the idea-standard behavior here (i.e. the 3-paned merge dialog appearance etc)