[
http://jira.codehaus.org/browse/MNG-612?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Brett Porter updated MNG-612:
-
Fix Version/s: (was: 3.x (to be reviewed))
Backlog
> implement conflict resolution techniqu
[
http://jira.codehaus.org/browse/MNG-612?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Jason van Zyl updated MNG-612:
--
Assignee: Mark Hobson (was: Jason van Zyl)
> implement conflict resolution techniques
> ---
[
http://jira.codehaus.org/browse/MNG-612?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Mark Hobson updated MNG-612:
Attachment: MNG-612-3.patch
> implement conflict resolution techniques
>
>
[
http://jira.codehaus.org/browse/MNG-612?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Jason van Zyl updated MNG-612:
--
Patch Submitted: (was: [Yes])
> implement conflict resolution techniques
> ---
[
http://jira.codehaus.org/browse/MNG-612?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Mark Hobson updated MNG-612:
Attachment: MNG-612-2.patch
Attaching slightly improved version of the patch:
- better ConflictResolver API
- made A
[
http://jira.codehaus.org/browse/MNG-612?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Mark Hobson updated MNG-612:
Attachment: MNG-612.patch
Attached an initial stab at this - patch is against 2.0.x. Will send an email
to dev to
