fix

Author: mariusconstantin2503

.github/workflows/github-actions-deploy.yml

@@ -21,7 +21,7 @@ jobs:
           git config --global user.email "[email protected]"
           git remote add upstream https://${{ secrets.CT_TOKEN }}@github.com/creativetimofficial/paper-dashboard-laravel
           git fetch --all
-          git merge upstream/master
+          git merge upstream/master --allow-unrelated-histories
           git push origin HEAD:master --force
           git push origin --tags
       - name: Checkout Fork
@@ -34,7 +34,7 @@ jobs:
           git config --global user.email "[email protected]"
           git remote add upstream https://${{ secrets.CT_TOKEN }}@github.com/laravel-frontend-presets/paper-dashboard
           git fetch --all
-          git merge upstream/master
+          git merge upstream/master --allow-unrelated-histories
           git push origin HEAD:master --force
           git push origin --tags
       - run: echo "The fork was updated"