Disallow use of error-prone merge-strategies

Test: No Change-Id: I2ed682c013e9bf0bfe43270382fcb8f9cec24e10
2021-02-23 15:04:32 +00:00
parent f3aa76929d
commit 6631354fb3
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}