Do not cherry-pick conflicting commits in CI auto-merge workflow The marked commits will be manually cherry-picked into the release branch. (cherry picked from commit 6aa6bfc266a7aacd4a4d42a235754acb0cd6e355)
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 0a769f2..d36d85c 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml
@@ -55,6 +55,8 @@ # A commit is a version bump IFF it touches third_party/prebuilt/repo DONT_PICK=$(cat <<EOF 5c073ba9c1283190467937b4456be9174b9be86c + f88c6897c77ba87aef0b40b57c930a182c24ae19 + a0924911c7f3b5bf4c87840a0ac63b95a19118e2 EOF ) git config --global user.email "kotlin-symbol-processing@google.com" @@ -146,6 +148,8 @@ # A commit is a version bump IFF it touches third_party/prebuilt/repo DONT_PICK=$(cat <<EOF 5c073ba9c1283190467937b4456be9174b9be86c + f88c6897c77ba87aef0b40b57c930a182c24ae19 + a0924911c7f3b5bf4c87840a0ac63b95a19118e2 EOF ) git config --global user.email "kotlin-symbol-processing@google.com"