Skip to content

Instantly share code, notes, and snippets.

@ADIX7

ADIX7/.gitattributes

Last active July 1, 2019 05:48
Show Gist options
  • Save ADIX7/1da2906875b22d6cc368e96e84242a91 to your computer and use it in GitHub Desktop.
Save ADIX7/1da2906875b22d6cc368e96e84242a91 to your computer and use it in GitHub Desktop.
Download ZIP
Unity git settings
Raw
.gitattributes
# Unity files
*.unity -text merge=unityyamlmerge diff
Raw
config
[merge "unityyamlmerge"]
name = Unity SmartMerge (UnityYamlMerge)
driver = 'c:\\Program Files\\Unity\\Hub\\Editor\\2019.1.8f1\\Editor\\Data\\Tools\\UnityYAMLMerge.exe' merge -h -p --force %O %B %A %A
recursive = binary
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment