diff --git a/.github/workflows/sync-upstream.yaml b/.github/workflows/sync-upstream.yaml
index 92a76f392b..a058e1cbab 100644
--- a/.github/workflows/sync-upstream.yaml
+++ b/.github/workflows/sync-upstream.yaml
@@ -31,7 +31,7 @@ jobs:
           echo "Latest upstream tag is ${LATEST_TAG}"
 
           # Merge the latest tag, but keep our version of the .github directory
-          git merge --no-commit upstream ${LATEST_TAG}
+          git merge --no-commit upstream "${LATEST_TAG}" || true
           git reset HEAD .github
           rm -rf .github
           git checkout HEAD -- .github