Enable ConflictResolution on partition merge with PreferConsistencyStrategy --------------------------------------------------------------------------- Key: ISPN-8440 URL: https://issues.jboss.org/browse/ISPN-8440 Project: Infinispan Issue Type: Enhancement Components: Core Affects Versions: 9.1.1.Final Reporter: Ryan Emerson Assignee: Ryan Emerson Fix For: 9.2.0.Final Currently conflict resolution only occurs on a partition merge when the PreferAvailabilityStrategy is utilised (ALLOW_READ_WRITES). This should also occur when utilising the PreferConsistencyStrategy as it's possible for cache entries to become conflicted before a split-brain has been detected.