Prevent Sibling Document Movement During Replication/Save Conflict Re-Save

Is there a way to prevent the moving of sibling documents when a save conflict document is re-saved (i.e. preventing them from becoming children of the re-saved conflict)?

The problem is that if someone is editing one of the siblings when someone else (or even the same person) re-saves the conflict, the sibling document will cause a save conflict when the user tries to save them. I want to prevent this.

On a more function basis, I sorta understand the reason for notes doing this, but in reality, should’nt notes simply leave the sibling documents alone, keeping them under their original parent. It seems monumentally rediculous to move them. And how does “document locking” work with this. I would assume that it would cause similar havoc with that as well.

If you need an example database I can provide that.

Thx in advance.