Skip to content

Commit 16d25ea

Browse files
committed
docs: fix stale git-workflow + release steps in CLAUDE.md
dev is abandoned (last touched 2026-04); work now forks off main. The release process referenced CURRENT_VERSION in tigo_web_server.cpp, which no longer exists — the UI shows ESPHome's own version. Rewrite the branch list and release steps to match reality (CHANGELOG [Unreleased] -> tag).
1 parent d605b97 commit 16d25ea

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

CLAUDE.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ Fuzzy barcode matching (`match_barcode()`): compares last 6 chars of UART-discov
8181

8282
## Git Workflow
8383

84-
- **`main`**: Stable releases only (tagged `vX.Y.Z`)
85-
- **`dev`**: Default development branch
86-
- **`feature/*`**: Feature branches
84+
- **`main`**: Trunk. Stable releases are tagged `vX.Y.Z` here, and current development also lands here via short-lived branches. Base for new work and the target for PRs.
85+
- **`feature/*`, `fix/*`**: Short-lived branches created off `main`, merged back to `main`.
86+
- Legacy branches `dev` (abandoned ~2026-04) and `next` (lagging, no unique work) are **not** the current line — start new work from `main`.
8787

8888
### Release Process
8989

90-
1. Update `CHANGELOG.md` on dev (group by Added/Fixed/Changed/Removed)
91-
2. Update `CURRENT_VERSION` in `tigo_web_server.cpp` JavaScript
92-
3. Merge dev → main, create annotated tag, push, create GitHub release
93-
4. Return to dev
90+
1. Update `CHANGELOG.md` under `## [Unreleased]` (group by Added/Fixed/Changed/Removed).
91+
2. Move the `## [Unreleased]` entries under a new `## [X.Y.Z]` heading, create an annotated tag `vX.Y.Z`, push, and create the GitHub release.
92+
93+
(The web UI shows ESPHome's own version via `esphome/core/version.h` — there is no project-specific version constant to bump.)

0 commit comments

Comments
 (0)