Update automatedpr.yml

ComputerSocietyVITC · Mar 25, 2024 · a588ec7 · a588ec7
1 parent ba135f1
commit a588ec7
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.github/workflows/automatedpr.yml b/.github/workflows/automatedpr.yml
@@ -22,4 +22,5 @@ jobs:
         git config pull.rebase false
         git remote add hackhub-24-testdeploy https://github.com/sam-shervin/hackhub-24-testdeploy
         git pull hackhub-24-testdeploy master --allow-unrelated-histories
+        git merge hackhub-24-testdeploy/master --allow-unrelated-histories -Xtheirs
         git push hackhub-24-testdeploy sam-patch:master --force