Asset Server - Merging moves and changes/new files fails?

So, I've noticed that it seems like the flakiest aspect of the Asset Server is how it handles when one user changes or creates a file and another user moves the folder containing that file.

So, imagine there's a Prefabs folder that contains a prefab named Castle. Now, let's say user A wants to work on loading prefabs dynamically, so he moves Prefabs into Resources/Prefabs. At the same time, user B, has changed some variables on the Castle prefab (which is still in user B's Prefabs folder, locally). User B also puts a new Bridge prefab in the Prefabs folder.

Now, if user A checks in his move, user B won't be able to check-in until pulling down the update from A. However, that's where things fall apart. When trying to merge that user A move update into user B's local changes, it just doesn't seem to work. I tend to see all kinds of weird things happen at that point. I get errors about parent folders not existing. I get files showing up in my changelist even though they're not changed. I sometimes have to revert files to get things back into a usable state.

In general, bad things happen when I move folders with the Asset Server.

Am I doing something wrong? Is there some better way to handle this type of thing that I don't understand?