Description
When two instances modify the same document at the same time, an automated merge is performed. It's always possible to hit a hard conflict in which case the replication system will make a choice but might not be the best one.
The system should notify all the authors involved in the conflicting versions that such a merge was done so that they can check if everything seems ok.
Attachments
Issue Links
- depends on
-
REPLICAT-57 In case of conflict the 3 ways merge might be done from the wrong common ancestor
- Closed