[
https://issues.apache.org/jira/browse/COUCHDB-1949?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13837062#comment-13837062
]
Nathan Vander Wilt commented on COUCHDB-1949:
---------------------------------------------
Dang, just realized this might be hard.
Each individual node can't really predict when/where conflicts will happen. So
how would it avoid compacting away the shared parent?
> Don't compact away shared parents of leaf nodes, allowing 3-way conflict merge
> ------------------------------------------------------------------------------
>
> Key: COUCHDB-1949
> URL: https://issues.apache.org/jira/browse/COUCHDB-1949
> Project: CouchDB
> Issue Type: Improvement
> Reporter: Nathan Vander Wilt
>
> I haven't actually verified this myself, but rumor has it that CouchDB
> compacts away all but a document's conflicting *leaf* nodes.
> While this may be sufficient in some situations to resolve the conflict(s),
> it would be more generally useful if app logic could rely on performing a
> 3-way merge.
--
This message was sent by Atlassian JIRA
(v6.1#6144)
