void IIncomingChangesViewMenuOperations.MergeKeepingWorkspaceChanges()
{
List <IncomingChangeInfo> fileConflicts = IncomingChangesSelection.
GetSelectedFileConflictsIncludingMeta(mIncomingChangesTreeView);
mIncomingChangesViewLogic.ProcessMergesForConflicts(
MergeContributorType.KeepDestination,
fileConflicts,
AfterProcessMerges);
}
void IIncomingChangesViewMenuOperations.MergeKeepingSourceChanges()
{
List <IncomingChangeInfo> fileConflicts = IncomingChangesSelection.
GetSelectedFileConflictsIncludingMeta(mIncomingChangesTreeView);
mIncomingChangesViewLogic.ProcessMergesForConflicts(
MergeContributorType.KeepSource,
fileConflicts,
RefreshAsset.UnityAssetDatabase);
}
void IIncomingChangesViewMenuOperations.MergeContributors()
{
if (LaunchTool.ShowDownloadPlasticExeWindow(
mWkInfo,
true,
TrackFeatureUseEvent.Features.InstallPlasticCloudFromMergeSelectedFiles,
TrackFeatureUseEvent.Features.InstallPlasticEnterpriseFromMergeSelectedFiles,
TrackFeatureUseEvent.Features.CancelPlasticInstallationFromMergeSelectedFiles))
{
return;
}
List <IncomingChangeInfo> fileConflicts = IncomingChangesSelection.
GetSelectedFileConflictsIncludingMeta(mIncomingChangesTreeView);
mIncomingChangesViewLogic.ProcessMergesForConflicts(
MergeContributorType.MergeContributors,
fileConflicts,
AfterProcessMerges);
}