FileConflictView CreateFileConflictView(FileConflictViewModel viewModel)
{
var view = new FileConflictView();
view.ViewModel = viewModel;
view.Owner = Owner;
return view;
}
FileConflictView CreateFileConflictView(FileConflictViewModel viewModel)
{
var view = new FileConflictView();
view.ViewModel = viewModel;
view.Owner = Owner;
return(view);
}
public FileConflictResolution ResolveFileConflict(string message)
{
if (workbench.InvokeRequired)
{
return(workbench.SafeThreadFunction(() => ResolveFileConflict(message)));
}
else
{
var viewModel = new FileConflictViewModel(message);
FileConflictView view = CreateFileConflictView(viewModel);
view.ShowDialog();
return(viewModel.GetResolution());
}
}