Skip to content

Latest commit

 

History

History
13 lines (10 loc) · 331 Bytes

BUILD.md

File metadata and controls

13 lines (10 loc) · 331 Bytes

Siren Build

Recommended git config

If possible add this to avoid merge conflicts

[merge]
	tool = unityyamlmerge
[mergetool "unityyamlmerge"]
	trustExitCode = false
	cmd = 'C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.10f1\\Editor\\Data\\Tools\\UnityYAMLMerge.exe' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"