logger.debug("Keeping your name");
<BUG>resolveConflictWithProgress(conflict.getLocalPath(), ResolveConflictsCommand.AutoResolveType.KeepYours, context, model, true);
}</BUG>
}
@VisibleForTesting
<BUG>protected void processContentConflict(final ServerContext context, final ResolveConflictsModel model, final ContentTriplet contentTriplet, final FilePath localPath) throws VcsException {
boolean resolved = true;</BUG>
if (contentTriplet != null) {
final File localFile = new File(localPath.getPath());
ArgumentHelper.checkIfFile(localFile);

logger.debug("Keeping your name");
resolveConflictWithProgress(conflict.getLocalPath(), ResolveConflictsCommand.AutoResolveType.KeepYours,
context, model, true, nameMergerResolution);
}
}
@VisibleForTesting
protected void processContentConflict(final ServerContext context, final ResolveConflictsModel model,
final ContentTriplet contentTriplet, final FilePath localPath,
final NameMergerResolution nameMergerResolution) throws VcsException {
boolean resolved = true;
if (contentTriplet != null) {
final File localFile = new File(localPath.getPath());
ArgumentHelper.checkIfFile(localFile);
