From 1fe94bea7942f352a52bffdc7bc77183a7e877dd Mon Sep 17 00:00:00 2001
From: Srinandan Sridhar <13950006+srinandan@users.noreply.github.com>
Date: Tue, 10 Dec 2024 09:31:52 -0800
Subject: [PATCH] Update gen-docs.yml

---
 .github/workflows/gen-docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gen-docs.yml b/.github/workflows/gen-docs.yml
index 92ffbcf..9ab6050 100644
--- a/.github/workflows/gen-docs.yml
+++ b/.github/workflows/gen-docs.yml
@@ -49,7 +49,7 @@ jobs:
           git fetch origin main
           git fetch origin gh_pages
           git checkout gh_pages
-          git merge origin/main --allow-unrelated-histories
+          git merge -X theirs origin/main --allow-unrelated-histories
 
           GOBIN=/tmp/ go install github.com/google/go-licenses@v1.0.0
           /tmp/go-licenses csv ./cmd/integrationcli > third-party-licenses.txt || echo "Ignore warnings"