[
https://jira.codehaus.org/browse/MNG-612?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Michael Osipov updated MNG-612:
---
Fix Version/s: (was: 3.x / Backlog)
> implement conflict resolution techniques
>
[
https://jira.codehaus.org/browse/MNG-612?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=343188#comment-343188
]
Benjamin Podgursky commented on MNG-612:
Sorry to jump on an ancient ticket, but could you poi
[
https://jira.codehaus.org/browse/MNG-612?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Jason van Zyl closed MNG-612.
-
Resolution: Incomplete
> implement conflict resolution techniques
>
[
https://jira.codehaus.org/browse/MNG-612?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=338843#comment-338843
]
Jason van Zyl commented on MNG-612:
---
All done with Aether now.
> implement conflict
