|
It has already been stated that they are considering partial merge-conflict resolution as a future product enhancement. I assume that the implementation of this would involve recording some of your suggested items of information.
Are you currently having to discard all changes on one of your machines, resyncing down the entire realm, and then adding back in the changes that you can remember?
|