Home | Blog | Recent Changes | Page Index | Site Map
History: Home > AbiCollab Peaceful Resolution Combinations

AbiCollab Peaceful Resolution Combinations


Possible Non-Default Results For Edit Collisions
(Working page for the Peaceful Resolution Matrix from AbiCollab Conflict Resolution)

•
two formatting changes (bold + italic, etc)
•
apply both, primary first (though this is arbitrary)
•
formatting change and insert/delete
•
perform insert/delete first, then formatting change on the selection (modifying end of selection as appropriate to account for insertion/deletion)
Login | Edit this page | AbiCollab_Peaceful_Resolution_Combinations mailing list

Copyright 2004-2007 Ryan Pavlik. Code released under the appropriate license to contribute. All trademarks are the property of their respective owners.