AbiCollab Conflict Resolution

When changes conflict, secondary users' changes are rolled back in favor of the primary user's changes. This may not always be necessary - a conflict may be resolved in some cases by applying both changes in arbitrary order. Furthermore, when such a "peaceful resolution" exists, the default resolution may startle users whose changes appear to not "take" or remain permanently in the document.

Before proceeding with default ("last-resort") rollback of secondary user changes, look up combination of changes in a resolution matrix. For instance, bold and italic can both be applied, bold/italic and insert would insert then bold the entire document portion (including the newly inserted region), etc. Such a matrix could be built up incrementally as I discover issues: leaving the existing conflict resolution as a sort of "case default:". AbiCollab Peaceful Resolution Combinations