pull rebase and -Xtheirs

Signed-off-by: miguelgfierro <[email protected]>
recommenders-team · Jan 4, 2024 · 9af8f1a · 9af8f1a
1 parent ee00e7e
commit 9af8f1a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/update_documentation.yml b/.github/workflows/update_documentation.yml
@@ -51,7 +51,7 @@ jobs:
         run: git config pull.rebase true
 
       - name: Pull latest changes from remote gh-pages branch
-        run: git pull origin gh-pages
+        run: git pull -Xtheirs origin gh-pages
 
       - name: Push changes to gh-pages
         run: git push origin gh-pages