MarijnProseMirror's OT actually gets the example case they use (concurrently editing/deleting a chunk of text) right, because it does think about user intention. It's still not suitable for big merges though. No automatic conflict-resolving system is, because conflicts are going to be too involved, subtle, and human for automatic resolution.
GNU social JP is a social network, courtesy of GNU social JP管理人. It runs on GNU social, version 2.0.2-dev, available under the GNU Affero General Public License.
All GNU social JP content and data are available under the Creative Commons Attribution 3.0 license.