Just attempted a merge of several weeks work of just over a hundred changesets from a branch to the trunk. Spent half an hour resolving merges, all seemed to be going well. However the merge appears to have been truncated abruptly with the message:
Warning: Integration interrupted. There are unresolved conflicts or skipped items.
It gives me no clear indication of whats in conflict or whats been skipped? how far into the merge have I got (revisions)? what am I supposed to do now?
I was careful to clear the trunk of all local changes, there was no conflict before the merge started I'm confused as to why it even broke, apparently even that information is missing.
I also cannot repeat the merge as it tells me I have local changes that conflict with the diff (form a partial merge).
Deeply frustrating and unhelpful, expected better from IDEA.