com.peterphi.std.io.properties

Interface IMergeConflictResolver

public interface IMergeConflictResolver

Method Summary

Methods

Modifier and Type	Method and Description
java.lang.String	resolveConflict(java.lang.String varName, java.lang.String currentValue, java.lang.String valueToBeMerged)

Method Detail

resolveConflict

java.lang.String resolveConflict(java.lang.String varName,
                               java.lang.String currentValue,
                               java.lang.String valueToBeMerged)