Replaces direct deployment workflow with merge-based approach for cvclaude branch

Replaces the direct deployment workflow for the cvclaude branch with a merge-based approach that builds the cvclaude branch and merges its content into the main branch's 360 subfolder. This change eliminates the need for a separate deployment workflow for the cvclaude branch and instead integrates its content into the main deployment process, simplifying the deployment pipeline while maintaining the same functionality.

Updates documentation to reflect the new workflow structure and explains the merge-based approach for the cvclaude branch content.

Author: EtienneLescot

.github/workflows/cvclaude-360.yml

@@ -0,0 +1,55 @@
+# Workflow to merge cvclaude branch content into main branch's 360 subfolder
+name: Merge CVClaude to 360 subfolder
+
+on:
+  # Runs on pushes targeting the cvclaude branch
+  push:
+    branches: ["cvclaude"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  merge-to-main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout main branch
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          token: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Checkout cvclaude branch
+        uses: actions/checkout@v4
+        with:
+          ref: cvclaude
+          path: cvclaude-build
+      
+      - name: Setup Node.js for cvclaude build
+        run: npm install
+        working-directory: ./cvclaude-build
+      
+      - name: Build cvclaude for 360 subfolder
+        run: npm run build
+        working-directory: ./cvclaude-build
+        env:
+          BASE_PATH: /cv/360
+      
+      - name: Create or update 360 subfolder in main
+        run: |
+          # Remove existing 360 folder if it exists
+          rm -rf 360
+          # Create 360 folder
+          mkdir -p 360
+          # Copy built files from cvclaude to 360 folder
+          cp -r cvclaude-build/*.html cvclaude-build/*.css cvclaude-build/*.js 360/ 2>/dev/null || true
+          # Clean up cvclaude-build directory
+          rm -rf cvclaude-build
+      
+      - name: Commit and push changes to main
+        run: |
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+          git add 360/
+          git commit -m "Update 360 subfolder with cvclaude branch content [skip ci]" || echo "No changes to commit"
+          git push

.github/workflows/merge-cvclaude-to-360.yml

@@ -11,15 +11,15 @@ This project now supports deploying multiple branches to GitHub Pages with diffe
 
 ### GitHub Actions Workflows
 
-Two separate workflows handle the deployments:
+Two workflows handle the deployments:
 
 #### Main Branch Workflow ([`static.yml`](.github/workflows/static.yml))
 - **Trigger**: Runs on pushes to `main` branch only
 - **Deployment**: Deploys to root path (`.`)
 
-#### CVClaude Branch Workflow ([`cvclaude-360.yml`](.github/workflows/cvclaude-360.yml))
-- **Trigger**: Runs on pushes to `cvclaude` branch only
-- **Deployment**: Deploys to `/360` subfolder
+#### CVClaude Merge Workflow ([`merge-cvclaude-to-360.yml`](.github/workflows/merge-cvclaude-to-360.yml))
+- **Trigger**: Runs on pushes to `cvclaude` branch
+- **Action**: Builds cvclaude branch and merges content into main branch's `/360` subfolder
 - **Configuration**: Uses `BASE_PATH=/cv/360` environment variable
 
 ### Build Process Modifications
@@ -53,19 +53,22 @@ GitHub Pages Structure:
 
 ## How It Works
 
-### 1. Separate Workflows
-
-Each branch has its own dedicated workflow:
+### 1. Main Branch Deployment
 
 **Main Branch Workflow** ([`static.yml`](.github/workflows/static.yml)):
 - Triggers on `main` branch pushes
 - Builds with default settings (root deployment)
-- Deploys files to root directory
+- Deploys files to root directory via GitHub Pages
+
+### 2. CVClaude Branch Integration
 
-**CVClaude Branch Workflow** ([`cvclaude-360.yml`](.github/workflows/cvclaude-360.yml)):
+**CVClaude Merge Workflow** ([`merge-cvclaude-to-360.yml`](.github/workflows/merge-cvclaude-to-360.yml)):
 - Triggers on `cvclaude` branch pushes
-- Builds with `BASE_PATH=/cv/360` environment variable
-- Moves files to `360/` subdirectory before deployment
+- Checks out both `main` and `cvclaude` branches
+- Builds cvclaude branch with `BASE_PATH=/cv/360` environment variable
+- Copies built files to `360/` subfolder in main branch
+- Commits and pushes changes to main branch
+- This triggers the main branch workflow to redeploy with updated 360 subfolder
 
 ### 2. Build Configuration