This document is based on Windows.
Open the file in the path above and modify it as below. Content changes may require administrator privileges.
15 to 21 lines should be changed like the capture. When there is a part that UnityYAMLMerge cannot handle, an external tool can be executed to handle the conflict directly. We use Meld for external tool.
To modify the file as shown in the above capture, modify the lines 15 to 21 below.
unity use "%programs%\\YouFallbackMergeToolForScenesHere.exe" "%l" "%r" "%b" "%d" prefab use "%programs%\\YouFallbackMergeToolForPrefabsHere.exe" "%l" "%r" "%b" "%d" # # Default fallbacks for unknown files. First tool found is used. #