Do not pick wrongly merged commits

(cherry picked from commit acba11c)
google · Feb 29, 2024 · dc5869b · dc5869b
1 parent 1333232
commit dc5869b
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -30,6 +30,12 @@ jobs:
         DONT_PICK=$(cat <<EOF
         d44ad7d9824aa0f073ce3c53e79361ae0f030d3b
         1a4ed56e3dc43f1d075fb2fa1f9f12f29bcd43cd
+        c65ac57cad85f38b314414489a53a7fcff414c8c
+        3ea749001abc37d4253e58be1861f17222091605
+        17d03d52f3c303da886bd0a9e82a5696ebbe825b
+        ba2bee790da28056c30b0bc30f22c36e83cb7e68
+        f52eef6634a8dcbfca6a335966464702ffbcb3b9
+        dd5a919a0c7d78c5b98ca856339de915cab2ed38
         EOF
         )
         git config --global user.email "kotlin-symbol-processing@google.com"
@@ -112,6 +118,12 @@ jobs:
           DONT_PICK=$(cat <<EOF
           d44ad7d9824aa0f073ce3c53e79361ae0f030d3b
           1a4ed56e3dc43f1d075fb2fa1f9f12f29bcd43cd
+          c65ac57cad85f38b314414489a53a7fcff414c8c
+          3ea749001abc37d4253e58be1861f17222091605
+          17d03d52f3c303da886bd0a9e82a5696ebbe825b
+          ba2bee790da28056c30b0bc30f22c36e83cb7e68
+          f52eef6634a8dcbfca6a335966464702ffbcb3b9
+          dd5a919a0c7d78c5b98ca856339de915cab2ed38
           EOF
           )
           git config --global user.email "kotlin-symbol-processing@google.com"