From d3b821cf47140ea7011d5da57a2ed67b6ef12786 Mon Sep 17 00:00:00 2001
From: George Karr <georgekarrv@users.noreply.github.com>
Date: Wed, 24 Apr 2024 17:22:24 -0500
Subject: [PATCH] Adding in cherry-pick into prepare branch and push (#18499)

---
 tools/release/publish_release.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/release/publish_release.sh b/tools/release/publish_release.sh
index 313774ab15..1ea01e37ac 100755
--- a/tools/release/publish_release.sh
+++ b/tools/release/publish_release.sh
@@ -855,6 +855,13 @@ if [[ "$failed" == "false" ]]; then
         echo "DRYRUN: Would have switched back to branch $target_patch_branch"
     fi
 
+    if [[ "$main_release" == "false" ]]; then
+        # Cherry-pick from update-changelog-branch
+        ch_commit=`git log -n 1 --pretty=format:"%H" $update_changelog_branch`
+        git cherry-pick $ch_commit
+        git push origin $target_patch_branch -f
+    fi
+
     # Check for QA issue
     create_qa_issue