Skip to content

A
angle
Commit bf433727 by Jamie Madill Committed by Commit Bot
Options

Use binary merge strategy for code generator hashes.

The binary merge strategy marks the file as conflicted but doesn't actually change the file contents. This keeps the json hashes file valid and alerts the user that the generator needs to be re-run. Bug: angleproject:3083 Change-Id: Ia04e96d56a2d92ee061f25e7de79b6a1fd3ce4ab Reviewed-on: https://chromium-review.googlesource.com/c/1423519Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 7403dd2c
Showing with 4 additions and 0 deletions
.gitattributes
...@@ -8,3 +8,7 @@ ...@@ -8,3 +8,7 @@
**/shaders/gen/*.inc eol=lf **/shaders/gen/*.inc eol=lf
*.sh eol=lf *.sh eol=lf
*.gn eol=lf *.gn eol=lf
# Git conflict markers in the json file break the code generator.
# Using a binary merge strategy forces a conflict without changing the file.
scripts/run_code_generation_hashes.json merge=binary
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment