Uses of Interface
com.peterphi.std.io.properties.IMergeConflictResolver

Packages that use IMergeConflictResolver

Package	Description
com.peterphi.std.io

Uses of IMergeConflictResolver in com.peterphi.std.io

Methods in com.peterphi.std.io with parameters of type IMergeConflictResolver

Modifier and Type	Method and Description
void	PropertyFile.merge(Properties other, IMergeConflictResolver conflictResolver) Merges another PropertyFile into this PropertyFile, using an optional merge conflict resolver If no merge conflict resolver is specified then the default will be that the properties from other will overwrite the local properties
void	PropertyFile.merge(PropertyFile other, IMergeConflictResolver conflictResolver) Merges another PropertyFile into this PropertyFile, using an optional merge conflict resolver If no merge conflict resolver is specified then the default will be that the properties from other will overwrite the local properties