Community
Participate
Working Groups
As discussed on Skype, at least TakeRemoteChangesThenApplyLocalChanges should be removed, cause its approach to conflict resolution is fundamentally incorrect.
AbstractObjectConflictResolver has now been deprecated in bug 335080
Available in R20110608-1407