izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
Files
2e78022581d72306421eae7f111fe5a3f5febaa1
UnrealEngineUWP/Engine/Source/Developer/SourceControl/Private/SSourceControlControls.cpp
wouter burgers b1096cb5d0 Skein / ConflictUE: Enable conflict resolution workflow and remove the obsolete retrieval of asset list pre-pass. 
If a conflict situation ever ends up blocking an internal developer (due to some unforeseen issue), the CLI command 'asset resolve conclude' can always get them out of it.

#rb Marco.Anastasi
#rnx

[CL 29884264 by wouter burgers in ue5-main branch]
2023-11-22 03:36:56 -05:00

12 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink