claude-thing
49 lines 1.3 kB view raw
1# Summary: Git Workflow for PDS Webroot 2 3## Setup Complete ✅ 4 5Your `/pds/caddy/webroot` is now a git repo connected to Tangled that auto-syncs! 6 7## How It Works: 8 9**On Your Mac:** 10- Clone the repo, add `status.html` to `.git/info/exclude` 11- Edit `index.html`, `create.html`, terms, privacy, etc. 12- Push changes to Tangled 13- `status.html` is ignored locally (no conflicts!) 14 15**On the Server (automatic every 5 minutes):** 161. Pull latest changes from Tangled (gets your Mac edits) 172. Generate fresh `status.html` with current metrics 183. Commit `status.html` 194. Push everything back to Tangled 20 21## Result: 22- 🎨 You edit HTML from your Mac → pushes to Tangled 23- 📊 Server auto-updates status.html every 5 min → pushes to Tangled 24- 🔄 Server always pulls before pushing (so it gets your changes) 25- ✅ No merge conflicts ever! 26 27## Commands You Need: 28 29**On Mac (first time):** 30```bash 31git clone git@tangled.sh:madebydanny.uk/mbd-pds 32cd mbd-pds 33echo "status.html" >> .git/info/exclude 34``` 35 36**On Mac (daily use):** 37```bash 38# Edit files, then: 39git add . 40git commit -m "Updated homepage" 41git push origin main 42``` 43 44**On Server (optional manual trigger):** 45```bash 46systemctl start status-report.service # Forces immediate update 47``` 48 49That's it! 🚀