Same question here. Tool seems half-baked, seems like we are missing some part of it (the actual resolve step)… Unreal 5.0 and still no clue on how to use it properly once we have the diff opened.
Only thing I see in the unreal log is this, after clicking “Finish merge” (the only thing you can actually do… no conflicts were there according to the tool):
Log LogUObjectGlobals Merging Blueprint: /Temp/Diff/MergeTool-Right
Log LogSourceControl Attempting 'p4 resolve -ay D:/MyProject/Saved/Diff/MergeTool-Right.uasset'
Error SourceControl CommandMessage Command: Resolve, Error: D:/MyProject/Saved/Diff/MergeTool-Right.uasset - no file(s) to resolve.
Log LogSourceControl Attempting 'p4 fstat -Or D:/MyProject/Saved/Diff/MergeTool-Right.uasset'
Error SourceControl CommandMessage Command: UpdateStatus, Error: D:/MyProject/Saved/Diff/MergeTool-Right.uasset - file(s) not in client view.
Log Cmd OBJ SAVEPACKAGE PACKAGE="/Temp/Diff/MergeTool-Right" FILE="../../../MyProject/Saved/Diff/MergeTool-Right.uasset" SILENT=true
Log LogPackageLocalizationCache Processed 35 localized package path(s) for 1 prioritized culture(s) in 0.066039 seconds
Log LogSavePackage Moving output files for package: /Temp/Diff/MergeTool-Right
Log LogSavePackage Moving '../../../MyProject/Saved/MergeTool-Right696C134A4CF1007DB4A228A943A7A073.tmp' to '../../../MyProject/Saved/Diff/MergeTool-Right.uasset'
Log LogSlate Window 'Merge Tool' being destroyed
Log AssetCheck New page: Asset Save: My_Component_BP
Display LogContentValidation Validating Blueprint /Temp/Diff/MergeTool-Right.My_Component_BP
Log Cmd QUIT_EDITOR
...