Use theirs from source commit when cherry-picking to site branch

apache · Apr 26, 2022 · 5813035 · 5813035
1 parent c7075f2
commit 5813035
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.github/workflows/publish-non-release-website-updates.yml b/.github/workflows/publish-non-release-website-updates.yml
@@ -39,7 +39,11 @@ jobs:
         run: |
           git config user.email ${{ github.actor }}@users.noreply.github.com
           git config user.name ${{ github.actor }}
-          git cherry-pick $GITHUB_SHA
+          git cherry-pick --strategy=recursive -X theirs $GITHUB_SHA
+          if [ $? -neq 0 ]; then
+            git status | sed -n 's/deleted by us://p' | xargs git add
+            git cherry-pick --continue --no-edit
+          fi
           git push origin site
 
   publish-website: