Smart Merging in Unity with Meld (Windows)

smart-merging-unity.md

1. In Unity, go to Edit > Project Settings > Edit > Asset Serialization > Mode and select Force Text.
2. Add UnityYAMLMerge.exe in %PATH%. (C:\Program Files\Unity\Editor\Data\Tools)
3. In .gitconfig (C:\Users<user>) add at the end of the file:

	[merge]
		tool = unityyamlmerge
	[mergetool "unityyamlmerge"]
		trustExitCode = false
		cmd = UnityYAMLMerge merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"

4. In mergespecfile.txt (C:\Program Files\Unity\Editor\Data\Tools):

Replace:

	unity use "%programs%\YouFallbackMergeToolForScenesHere.exe" "%l" "%r" "%b" "%d"
	prefab use "%programs%\YouFallbackMergeToolForPrefabsHere.exe" "%l" "%r" "%b" "%d"

For:

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