Update GitHub Actions workflow to merge 'dev' into 'main' instead of resetting

Author: dconco

.github/workflows/tests.yml

@@ -63,8 +63,8 @@ jobs:
 
          - name: Push changes to main
            run: |
-              git checkout -b main
-              git reset --hard dev
-              git push -u -f origin main
+              git checkout main
+              git merge dev
+              git push origin main
            env:
               GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}