jordan hoffmann 1625c5cc66 [BugFix] Deprecated ISourceControlState::GetBaseRevForMerge and replaced it with ISourceControlState::GetResolveInfo so we can properly support merges and integrations between branches and merging changes that aren't the latest ...

#rb brooke.hubert, mattias.jansson, wouter.burgers
#preflight 64556c1ad77a82d6a78e3388

[CL 25365368 by jordan hoffmann in ue5-main branch]

2023-05-06 02:07:43 -04:00

..

BlueprintMergeData.h

…

Merge.cpp

[BugFix] Deprecated ISourceControlState::GetBaseRevForMerge and replaced it with ISourceControlState::GetResolveInfo so we can properly support merges and integrations between branches and merging changes that aren't the latest

2023-05-06 02:07:43 -04:00

MergeUtils.cpp

…

MergeUtils.h

…

SBlueprintMerge.cpp

…

SBlueprintMerge.h

…

SMergeAssetPickerView.cpp

…

SMergeAssetPickerView.h

…

SMergeDetailsView.cpp

…

SMergeDetailsView.h

…

SMergeGraphView.cpp

Uses of ::Sort/::StableSort replaced with Algo versions.

2023-03-28 10:56:46 -04:00

SMergeGraphView.h

…

SMergeTreeView.cpp

…

SMergeTreeView.h

…