although I've worked with IDEA for years, I very recently detected the Shelve function and thought it was what I needed for years.
But my experiences with it made me think if I understood it quite well.
Example: this morning I shelved a changeset which contained 10 files. Then I worked on a tiny other fix and committed it to CVS. Afterwards I wanted to resume my previous work and did "Unshelve changes". Astonishingly it opened the IDEA diff window for two files and reported problems. From the diff content I could not see why there should be conflicts. Because I didn't know what to do, I confirmed both files with OK and found myself with a non-compiling project. Furthermore I had some same files in the changeset and in the shelve and had no idea how to fix the situation.
That's why I reverted back to the version early this morning (before shelving) via IDEA local history. I repeated the shelve/unshelve process because I though I might have overlooked something, but the problem repeated and I still have no idea.
Any ideas what could be the problem?