#7626: Shelving changes

I shelved a small set of changes I was working on, so that I could fix a bug. Once I'd made and committed the bug fix, I tried to unshelve the changes, but I got an error dialog saying it was unable to unshelve the changes because of a conflict.

When I tried a 'Show Diff' on the shelved file, I got the two diff panels displayed, but only the left hand panel, 'Base Version', had code in it.

In the end, I had to go into the local history and do a merge by hand from the point where I had shelved the changes.

Is this behaviour expected?
Is there a better way to handle shelved changes that can't be unshelved because of a conflict?

2 comments

Hello Dave,

Which VCS are you using?

I shelved a small set of changes I was working on, so that I could fix
a bug. Once I'd made and committed the bug fix, I tried to unshelve
the changes, but I got an error dialog saying it was unable to
unshelve the changes because of a conflict.

When I tried a 'Show Diff' on the shelved file, I got the two diff
panels displayed, but only the left hand panel, 'Base Version', had
code in it.

In the end, I had to go into the local history and do a merge by hand
from the point where I had shelved the changes.

Is this behaviour expected? Is there a better way to handle shelved
changes that can't be unshelved because of a conflict?

--
Dmitry Jemerov
Development Lead
JetBrains, Inc.
http://www.jetbrains.com/
"Develop with Pleasure!"


0

Please sign in to leave a comment.