ss

Author: dconco

.github/workflows/tests.yml

@@ -65,8 +65,8 @@ jobs:
            run: |
               git branch main
               git checkout main
-              git merge origin/dev
               git pull origin main
+              git merge origin/dev --allow-unrelated-histories
               git push origin main
            env:
               GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}