Update latex.yml

nsswifter · Dec 6, 2024 · b11f49d · b11f49d
1 parent 4c6df4e
commit b11f49d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/latex.yml b/.github/workflows/latex.yml
@@ -33,7 +33,7 @@ jobs:
         git add CV.pdf
         git commit -m "Update CV.pdf"
         git fetch origin
-        git merge origin/update-cv --no-ff -m "Merge remote-tracking branch 'origin/update-cv'"
+        git merge origin/update-cv --no-ff --allow-unrelated-histories -m "Merge remote-tracking branch 'origin/update-cv'"
         git checkout --theirs CV.pdf
         git add CV.pdf
         git add .github/workflows/latex.yml
@@ -50,4 +50,4 @@ jobs:
                 "base": "main",  # The branch you're merging into
                 "body": "Automated PR to update CV"
                 }' \
-          https://api.github.com/repos/nsswifter/AcademicApplicationDocuments/pulls
+          https://api.github.com/repos/nsswifter/AcademicApplicationDocuments/pulls