.gitattributes

Show log
Commit

Hash : 53aff41e
Author :
Date : 2019-07-11T14:06:23

Use separate json files for each code generator.

This should reduce the number of merge conflicts when multiple people
touch different generators. There still will be merge conflicts when
two people touch the same code generator.

Bug: angleproject:3691
Change-Id: I0b179368a1352331c091972568c00213ab106e46
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1698650
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Ian Elliott <ianelliott@google.com>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

Download

.gitattributes

*                    text=auto
*.sln                eol=crlf
*.vcxproj            eol=crlf
*.vcxproj.filters    eol=crlf
*.bat                eol=crlf
*.rc                 eol=crlf
**/compiled/*.h      eol=crlf
**/shaders/gen/*.inc eol=lf
*.sh                 eol=lf
*.gn                 eol=lf
*.gni                eol=lf

# Git conflict markers in the json file break the code generator.
# Using a binary merge strategy forces conflicts without changing file contents.
scripts/code_generation_hashes/*.json merge=binary

Download