Resolve merge conflict: remove events.json as it should be auto-generated

- Keep events.json deleted since it's now in .gitignore
- File will be generated fresh during build process
- Prevents future merge conflicts on auto-generated content

Author: Dale Kunce

.github/workflows/deploy.yml

@@ -55,6 +55,8 @@ jobs:
     needs: build
     if: github.ref == 'refs/heads/publish' && github.event_name == 'push'
     steps:
+      - name: Checkout master branch
+        uses: actions/checkout@v4
       - name: Checkout master branch
         uses: actions/checkout@v4
         with:
@@ -74,11 +76,13 @@ jobs:
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
           
-          # Remove all files except .git
-          find . -maxdepth 1 ! -name '.git' ! -name '.' ! -name '..' -exec rm -rf {} +
+          # Remove all files except .git and _site
+          find . -maxdepth 1 ! -name '.git' ! -name '_site' ! -name '.' ! -name '..' -exec rm -rf {} +
           
-          # Copy built site files to root
+          # Copy built site files to root (GitHub Pages expects files in root, not in _site)
           cp -r _site/* .
+          
+          # Remove the _site directory (not needed for GitHub Pages)
           rm -rf _site
           
           # Add and commit changes
@@ -88,4 +92,4 @@ jobs:
           else
             git commit -m "CI deploy to gh-pages from publish@${{ github.sha }}"
             git push origin master
-          fi
+          fi