[
https://issues.apache.org/jira/browse/OAK-133?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13293701#comment-13293701
]
Michael Dürig commented on OAK-133:
-----------------------------------
On a second thought, it might be better to use a mixin to mark conflicts. This
is less invasive and leaves the original structure of the involved sub-tree
intact. The mixin would provide the definition for the 'theirs' node which
would be set to the persisted node while the node itself would stay untouched
(i.e. keep all transient changes) otherwise.
To avoid oak-core requiring knowledge of the specific mixin, this could be
factored into some kind of merge handler.
> Session.refresh(true) should allow for manual conflict reconciliation
> ---------------------------------------------------------------------
>
> Key: OAK-133
> URL: https://issues.apache.org/jira/browse/OAK-133
> Project: Jackrabbit Oak
> Issue Type: New Feature
> Components: core
> Reporter: Michael Dürig
>
> There should be a way for manual reconciliation of conflicts which
> {{Session.refresh(true)}} cannot handle automatically. See OAK-131 for one
> such case and Jukka's proposal for using conflict markers for such cases [1].
> [1] http://markmail.org/message/qogspnyao5yjwl45
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
