[
https://issues.apache.org/jira/browse/OAK-133?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Michael Dürig resolved OAK-133.
-------------------------------
Resolution: Fixed
Fix Version/s: 0.3
Fixed at revision 1350287
> 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, jcr
> Reporter: Michael Dürig
> Assignee: Michael Dürig
> Fix For: 0.3
>
>
> 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
