Dominique Jäggi created OAK-3381:
------------------------------------
Summary: Provide Common Ancestor To ConflictHandler
Key: OAK-3381
URL: https://issues.apache.org/jira/browse/OAK-3381
Project: Jackrabbit Oak
Issue Type: Improvement
Components: core
Affects Versions: 1.3.5
Reporter: Dominique Jäggi
currently _ConflictHandler_s are provided _ours_ and _theirs_, reflecting a
memory state and persisted state of changes to the same root resulting in a
conflict.
unfortunately the information provided to _ConflictHandlers_ does not include
the common ancestor, needed for meaningful change-change merges (three-way
merge).
the core should be enhanced to provide such information to _ConflictHandlers_.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
