Skip to content

Commit

Permalink
Disallow use of error-prone merge-strategies
Browse files Browse the repository at this point in the history
Test: No
Change-Id: I6b573c4bfeddfe14ef035e63238747577450a78c
  • Loading branch information
Anton Hansson committed Feb 23, 2021
1 parent d6a7f16 commit 62328d8
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions PREUPLOAD.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[Hook Scripts]
do_not_use_DO_NOT_MERGE = ${REPO_ROOT}/build/soong/scripts/check_do_not_merge.sh ${PREUPLOAD_COMMIT}

0 comments on commit 62328d8

Please sign in to comment.