We have a major overhaul of the relevant functionality being tested right now and our next release will address the issues raised in this thread, as well some other issues related to how we track files and attach edits to them.
I spent a few hours today making edits and trying to lose them without success, so we’re feeling pretty good about these changes. Expect some documentation describing the “right way” to move content around as soon as the build is live.
Appreciate your patience here @Steve_Lees!