void IIncomingChangesViewMenuOperations.MergeContributors()
{
if (LaunchTool.ShowDownloadPlasticExeWindow(
mWkInfo,
false,
TrackFeatureUseEvent.Features.InstallPlasticCloudFromMergeSelectedFiles,
TrackFeatureUseEvent.Features.InstallPlasticEnterpriseFromMergeSelectedFiles,
TrackFeatureUseEvent.Features.CancelPlasticInstallationFromMergeSelectedFiles))
{
return;
}
List <string> selectedPaths = IncomingChangesSelection.
GetPathsFromSelectedFileConflictsIncludingMeta(
mIncomingChangesTreeView);
mMergeViewLogic.ProcessMerges(
mWorkspaceWindow,
mSwitcher,
mGuiMessage,
selectedPaths,
MergeContributorType.MergeContributors,
RefreshAsset.UnityAssetDatabase,
null);
}
void IIncomingChangesViewMenuOperations.MergeKeepingWorkspaceChanges()
{
List <string> selectedPaths = IncomingChangesSelection.
GetPathsFromSelectedFileConflictsIncludingMeta(
mIncomingChangesTreeView);
mMergeViewLogic.ProcessMerges(
mWorkspaceWindow,
mSwitcher,
mGuiMessage,
selectedPaths,
MergeContributorType.KeepDestination,
RefreshAsset.UnityAssetDatabase);
}
void IIncomingChangesViewMenuOperations.MergeContributors()
{
List <string> selectedPaths = IncomingChangesSelection.
GetPathsFromSelectedFileConflictsIncludingMeta(
mIncomingChangesTreeView);
mMergeViewLogic.ProcessMerges(
mPlasticClient,
mSwitcher,
mGuiMessage,
selectedPaths,
MergeContributorType.MergeContributors,
RefreshAsset.UnityAssetDatabase);
}