Correcting previous comment: I can't reproduce the issue of losing the currently uncommitted changes when triggering this bug. And as I can't remember the exact sequence of commands I issued when I was trying to fix the tree, it could very well have been my mistake. So please ignore that part.
Correcting previous comment: I can't reproduce the issue of losing the currently uncommitted changes when triggering this bug. And as I can't remember the exact sequence of commands I issued when I was trying to fix the tree, it could very well have been my mistake. So please ignore that part.