Skip to content

Commit c306beb

Browse files
committed
fix doc action
1 parent f941f46 commit c306beb

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

.github/workflows/deploy-pr-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ jobs:
250250
git status
251251
git diff
252252
253-
git pull --rebase origin gh-pages
253+
git pull --rebase --strategy-option=theirs origin gh-pages
254254
git push origin gh-pages
255255
echo "✅ Documentation preview deployed!"
256256
echo "🔗 View at: https://datasophos.github.io/NexusLIMS/pr-${PR_NUMBER}/"

0 commit comments

Comments
 (0)