基本上做法很簡單,就是利用UE4 Editor傳入-diff參數後,藉由tortoise git的external diff viewer來達成目的。這樣的話,我們就不需要開editor就可以呼叫ue4的diff window了。實際指令如下:
${UE4_ENGINE_ROOT}\Engine\Binaries\Win64\UE4Editor.exe -diff %base %mine
可參考下面程式碼的實作:
Engine\Source\Editor\UnrealEd\Private\EditorCommandLineUtils.cpp
Usage: \n\
-diff [options] left right \n\
-diff [options] remote local base result \n\
要做 merge的話,可以使用這個指令: ${UE4_ENGINE_ROOT}\ \Engine\Binaries\Win64\UE4Editor.exe -diff %theirs %mine %base %merged
Leave a Reply