Unity Merge configuration

Unity Merge of scenes and prefabs

Unity Doc
https://docs.unity3d.com/Manual/SmartMerge.html

Tutorial
https://www.youtube.com/watch?v=EQB-N-ClO9g

Steps:
Install meld: http://meldmerge.org/

Config SourceTree
Tools->Options->Diff->Mergetool - Set to custom
Diff command: C:\Program Files\Unity\Editor\Data\Tools\UnityYAMLMerge.exe
Diff arguments: merge -p $BASE $REMOTE $LOCAL $MERGED

Edit the file
C:\Program Files\Unity\Editor\Data\Tools\mergespecfile.txt

unity use "%programs%\Meld\meld.exe" "%r" "%b" "%l" -o "%d" --auto-merge
prefab use "%programs%\Meld\meld.exe" "%r" "%b" "%l" -o "%d" --auto-merge

#
# Default fallbacks for unknown files. First tool found is used.
#
* use "%programs%\Meld\meld.exe" "%r" "%b" "%l" -o "%d" --auto-merge