Disallow use of error-prone merge-strategies

Test: No Change-Id: I6b573c4bfeddfe14ef035e63238747577450a78c
2021-02-23 15:07:02 +00:00 · 2021-02-23 15:07:02 +00:00 · 62328d8519
parent d6a7f16416
commit 62328d8519
1 changed files with 2 additions and 0 deletions
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@ -0,0 +1,2 @@
+[Hook Scripts]
+do_not_use_DO_NOT_MERGE = ${REPO_ROOT}/build/soong/scripts/check_do_not_merge.sh ${PREUPLOAD_COMMIT}