[
https://issues.apache.org/jira/browse/OAK-4893?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Michael Dürig resolved OAK-4893.
--------------------------------
Resolution: Done
Fix Version/s: (was: 1.6.1)
1.7.0
Done at http://svn.apache.org/viewvc?rev=1784290&view=rev
> Document conflict handling
> --------------------------
>
> Key: OAK-4893
> URL: https://issues.apache.org/jira/browse/OAK-4893
> Project: Jackrabbit Oak
> Issue Type: Task
> Components: doc
> Reporter: Michael Dürig
> Assignee: Michael Dürig
> Labels: documentation
> Fix For: 1.7.0, 1.8
>
>
> We should add documentation how Oak deals with conflicts. This was once
> documented in the Javadocs of {{MicroKernel.rebase()}} but got lost along
> with that class. Note that OAK-1553 refines conflict handling but this
> refinement has not been implemented in all backends yet.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
