diff options
| author | Danilo M. <danix@danix.xyz> | 2026-04-28 10:38:08 +0200 |
|---|---|---|
| committer | Danilo M. <danix@danix.xyz> | 2026-04-28 10:38:08 +0200 |
| commit | ba462ddcef07445294d4e19ca0c5d440d8c51b12 (patch) | |
| tree | fcaaecfb49693f08d19dadc105d754e4dd923c35 /CLAUDE.md | |
| parent | da66ef2a6fc569587bd611a9c7f2d78b371f69a7 (diff) | |
| download | danixxyz-ba462ddcef07445294d4e19ca0c5d440d8c51b12.tar.gz danixxyz-ba462ddcef07445294d4e19ca0c5d440d8c51b12.zip | |
docs: update git workflow for production branch strategy
Replace master-as-deploy with three-branch model: feature branches →
master (staging) → production (live). Master no longer triggers deploy.
Updated CLAUDE.md, AGENTS.md, WORKFLOW.md, and all docs/policies files
to reflect production branch approach. Includes deployment commands and
updated FAQ.
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
Diffstat (limited to 'CLAUDE.md')
| -rw-r--r-- | CLAUDE.md | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -42,6 +42,11 @@ DO NOT write code for shortcodes without consulting the user first. Implement: - Theme repo: `~/Programming/GIT/danix2-hugo-theme/` → `danix_git:danix2-hugo-theme` - Theme lives as submodule at `themes/danix-xyz-hacker/` in content repo +**Three branches, defined roles:** +- `master`: staging/dev branch. All feature branches merge here. Safe for WIP commits and testing. +- `production`: live branch. Merges only from master when ready to ship. Post-receive hook fires on production pushes only. +- Feature branches: work branches for features, content, or experiments. Merge to master when done. + **Theme work:** 1. Edit in theme repo OR submodule (always `git checkout master` first if using submodule) 2. Commit and push to `danix2-hugo-theme` @@ -52,9 +57,10 @@ DO NOT write code for shortcodes without consulting the user first. Implement: 2. Commit compiled CSS in theme: `cd themes/danix-xyz-hacker && git add assets/css/main.min.css && git commit -m "build: recompile CSS" && git push origin master` 3. Bump submodule: `cd .. && git add themes/danix-xyz-hacker && git commit -m "chore: bump theme submodule (CSS rebuild)" && git push origin master` -**Deployment:** -- Production hook clones latest `danix2-hugo-theme` master tip on each content push -- Theme changes deploy automatically on next content push (no submodule bump required for deployment, only for local tracking) +**Deployment to production:** +1. When master is ready to ship: `git checkout production && git merge master && git push origin production` +2. Post-receive hook clones latest `danix2-hugo-theme` master tip and builds the site +3. Theme changes deploy automatically on next production push (no submodule bump required for deployment, only for local tracking) ## 🎨 Styling & Build Pipeline - **Tailwind CSS**: Uses npm build pipeline with `tailwind.config.js` |