Resolving Conflicts is hard

Scander
Sat, 13 Dec 2025 13:42:46 +0000
Programming & Scripting

When I am trying to resolve a conflict with the unreal diff and merge tool, as soon as I hit accet source or accept target, it crashes. In general ‘HOW DO YOU PEOPLE MANAGE CONFLICTS?’

I am attaching the crash dump.

Note: My diff is opening properly, but with a message saying the file format is invalid, and needs to be checked. [Something like this]…

Below is the log before launching the diff -

[2025-12-13 18:50:07] — Merge Tool Execution Start —
[2025-12-13 18:50:07] Repository Root: D:\Projects\Unreal\ProjectCash
[2025-12-13 18:50:07] Project File Name: HWG_Monopoly.uproject
[2025-12-13 18:50:07] Project Path: D:\Projects\Unreal\ProjectCash\HWG_Monopoly.uproject
[2025-12-13 18:50:07] Remote (arg[0]): ./Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode_REMOTE_777.uasset ./Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode_LOCAL_777.uasset ./Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode_BASE_777.uasset Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode.uasset[0]
[2025-12-13 18:50:07] Local (arg[1]): ./Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode_REMOTE_777.uasset ./Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode_LOCAL_777.uasset ./Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode_BASE_777.uasset Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode.uasset[1]
[2025-12-13 18:50:07] Base (arg[2]): ./Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode_REMOTE_777.uasset ./Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode_LOCAL_777.uasset ./Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode_BASE_777.uasset Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode.uasset[2]
[2025-12-13 18:50:07] Merged (arg[3]): ./Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode_REMOTE_777.uasset ./Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode_LOCAL_777.uasset ./Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode_BASE_777.uasset Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode.uasset[3]
[2025-12-13 18:50:07] Resolved Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode_REMOTE_777.uasset to D:\Projects\Unreal\ProjectCash\Content\Game\GameMode\Monopoly\Game\BP_Monopoly_GMode_REMOTE_777.uasset
[2025-12-13 18:50:07] Resolved Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode_LOCAL_777.uasset to D:\Projects\Unreal\ProjectCash\Content\Game\GameMode\Monopoly\Game\BP_Monopoly_GMode_LOCAL_777.uasset
[2025-12-13 18:50:07] Resolved Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode_BASE_777.uasset to D:\Projects\Unreal\ProjectCash\Content\Game\GameMode\Monopoly\Game\BP_Monopoly_GMode_BASE_777.uasset
[2025-12-13 18:50:07] Resolved Content/Game/GameMode/Monopoly/Game/BP_Monopoly_GMode.uasset to D:\Projects\Unreal\ProjectCash\Content\Game\GameMode\Monopoly\Game\BP_Monopoly_GMode.uasset
[2025-12-13 18:50:07] — Final Editor Command —
[2025-12-13 18:50:07] E:\UEBuilds\clone\Engine\Binaries\Win64\UnrealEditor.exe D:\Projects\Unreal\ProjectCash\HWG_Monopoly.uproject -diff “D:\Projects\Unreal\ProjectCash\Content\Game\GameMode\Monopoly\Game\BP_Monopoly_GMode_REMOTE_777.uasset” “D:\Projects\Unreal\ProjectCash\Content\Game\GameMode\Monopoly\Game\BP_Monopoly_GMode_LOCAL_777.uasset” “D:\Projects\Unreal\ProjectCash\Content\Game\GameMode\Monopoly\Game\BP_Monopoly_GMode_BASE_777.uasset” “D:\Projects\Unreal\ProjectCash\Content\Game\GameMode\Monopoly\Game\BP_Monopoly_GMode.uasset”
[2025-12-13 18:50:07] ----------------------------

Below is the crash dump:

LoginId:2e67d3614b7290a7f0f2dbaca8ba9638
EpicAccountId:26d6ea0188974048ac0914a02bed2eb9

Unhandled Exception: EXCEPTION_ACCESS_VIOLATION 0x0000000000000000

UnrealEditor_CoreUObject!UClass::InternalCreateDefaultObjectWrapper() [E:\UEBuilds\clone\Engine\Source\Runtime\CoreUObject\Private\UObject\Class.cpp:5572]
UnrealEditor_UnrealEd!UE::Private::FReplaceReferenceHelper::IncludeCDO() [E:\UEBuilds\clone\Engine\Source\Editor\UnrealEd\Private\Kismet2\KismetReinstanceUtilities.cpp:210]
UnrealEditor_UnrealEd!FBlueprintCompileReinstancer::ReplaceInstancesOfClass_Inner() [E:\UEBuilds\clone\Engine\Source\Editor\UnrealEd\Private\Kismet2\KismetReinstanceUtilities.cpp:2923]
UnrealEditor_UnrealEd!FBlueprintCompileReinstancer::ReplaceInstancesOfClass() [E:\UEBuilds\clone\Engine\Source\Editor\UnrealEd\Private\Kismet2\KismetReinstanceUtilities.cpp:1927]
UnrealEditor_UnrealEd!FBlueprintUnloader::ReplaceStaleRefs() [E:\UEBuilds\clone\Engine\Source\Editor\UnrealEd\Private\Kismet2\Kismet2.cpp:384]
UnrealEditor_UnrealEd!FKismetEditorUtilities::ReplaceBlueprint() [E:\UEBuilds\clone\Engine\Source\Editor\UnrealEd\Private\Kismet2\Kismet2.cpp:751]
UnrealEditor_Merge!SBlueprintMerge::OnAcceptRemote() [E:\UEBuilds\clone\Engine\Source\Developer\Merge\Private\SBlueprintMerge.cpp:456]
UnrealEditor_Merge!TBaseSPMethodDelegateInstance<0,SBlueprintMerge,1,void __cdecl(void),FDefaultDelegateUserPolicy>::ExecuteIfSafe() [E:\UEBuilds\clone\Engine\Source\Runtime\Core\Public\Delegates\DelegateInstancesImpl.h:309]
UnrealEditor_Slate!FUIAction::Execute() [E:\UEBuilds\clone\Engine\Source\Runtime\Slate\Public\Framework\Commands\UIAction.h:139]
UnrealEditor_Slate!SToolBarButtonBlock::OnClicked() [E:\UEBuilds\clone\Engine\Source\Runtime\Slate\Private\Framework\MultiBox\SToolBarButtonBlock.cpp:525]
UnrealEditor_Slate!TBaseSPMethodDelegateInstance<0,SToolBarButtonBlock,1,FReply __cdecl(void),FDefaultDelegateUserPolicy>::Execute() [E:\UEBuilds\clone\Engine\Source\Runtime\Core\Public\Delegates\DelegateInstancesImpl.h:292]
UnrealEditor_Slate!SButton::ExecuteOnClick() [E:\UEBuilds\clone\Engine\Source\Runtime\Slate\Private\Widgets\Input\SButton.cpp:495]
UnrealEditor_Slate!SButton::OnMouseButtonUp() [E:\UEBuilds\clone\Engine\Source\Runtime\Slate\Private\Widgets\Input\SButton.cpp:419]
UnrealEditor_Slate!FSlateApplication::RoutePointerUpEvent'::8’::<lambda_2>::operator()() [E:\UEBuilds\clone\Engine\Source\Runtime\Slate\Private\Framework\Application\SlateApplication.cpp:5367]
UnrealEditor_Slate!FEventRouter::Route<FReply,FEventRouter::FToLeafmostPolicy,FPointerEvent,FSlateApplication::RoutePointerUpEvent'::8’::<lambda_2> >() [E:\UEBuilds\clone\Engine\Source\Runtime\Slate\Private\Framework\Application\SlateApplication.cpp:456]
UnrealEditor_Slate!FSlateApplication::RoutePointerUpEvent() [E:\UEBuilds\clone\Engine\Source\Runtime\Slate\Private\Framework\Application\SlateApplication.cpp:5353]
UnrealEditor_Slate!FSlateApplication::ProcessMouseButtonUpEvent() [E:\UEBuilds\clone\Engine\Source\Runtime\Slate\Private\Framework\Application\SlateApplication.cpp:5938]
UnrealEditor_Slate!FSlateApplication::OnMouseUp() [E:\UEBuilds\clone\Engine\Source\Runtime\Slate\Private\Framework\Application\SlateApplication.cpp:5894]
UnrealEditor_ApplicationCore!FWindowsApplication::ProcessDeferredMessage() [E:\UEBuilds\clone\Engine\Source\Runtime\ApplicationCore\Private\Windows\WindowsApplication.cpp:3052]
UnrealEditor_ApplicationCore!FWindowsApplication::DeferMessage() [E:\UEBuilds\clone\Engine\Source\Runtime\ApplicationCore\Private\Windows\WindowsApplication.cpp:3570]
UnrealEditor_ApplicationCore!FWindowsApplication::ProcessMessage() [E:\UEBuilds\clone\Engine\Source\Runtime\ApplicationCore\Private\Windows\WindowsApplication.cpp:2725]
UnrealEditor_ApplicationCore!FWindowsApplication::AppWndProc() [E:\UEBuilds\clone\Engine\Source\Runtime\ApplicationCore\Private\Windows\WindowsApplication.cpp:1722]
user32
user32
UnrealEditor_ApplicationCore!FWindowsPlatformApplicationMisc::PumpMessages() [E:\UEBuilds\clone\Engine\Source\Runtime\ApplicationCore\Private\Windows\WindowsPlatformApplicationMisc.cpp:145]
UnrealEditor!FEngineLoop::Tick() [E:\UEBuilds\clone\Engine\Source\Runtime\Launch\Private\LaunchEngineLoop.cpp:5554]
UnrealEditor!GuardedMain() [E:\UEBuilds\clone\Engine\Source\Runtime\Launch\Private\Launch.cpp:187]
UnrealEditor!GuardedMainWrapper() [E:\UEBuilds\clone\Engine\Source\Runtime\Launch\Private\Windows\LaunchWindows.cpp:128]
UnrealEditor!LaunchWindowsStartup() [E:\UEBuilds\clone\Engine\Source\Runtime\Launch\Private\Windows\LaunchWindows.cpp:282]
UnrealEditor!WinMain() [E:\UEBuilds\clone\Engine\Source\Runtime\Launch\Private\Windows\LaunchWindows.cpp:339]
UnrealEditor!__scrt_common_main_seh() [D:\a_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl:288]
kernel32
ntdll

1 post - 1 participant