From f0ee52b3ef5be10d43dedc18fe0a53f9107fffe9 Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Wed, 5 Nov 2025 16:21:14 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9D=20Add=20Git=20Flow=20Workflow=20gu?= =?UTF-8?q?idelines=20to=20AGENTS.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AGENTS.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/AGENTS.md b/AGENTS.md index 50a1aca..e2e6343 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -24,6 +24,18 @@ - **Style**: Write detailed commit messages that explain what changed and why - **Examples**: `✨ Add JSON export functionality for log entries`, `🐛 Fix date parsing for RFC3339 timestamps`, `📝 Update README with configuration examples` +## Git Flow Workflow +- **Main branches**: `stable` (production-ready), `develop` (integration branch) +- **Development**: Always commit new features/fixes to `develop` branch or appropriate feature branches +- **Branch prefixes**: + - `feat/feature-name` - New features, merge to `develop` when complete + - `bug/bug-name` - Bug fixes (non-urgent), merge to `develop` when complete + - `hot/version` - Hotfixes for production issues, merge to **both** `stable` and `develop` + - `rel/version` - Release preparation branches +- **Version tags**: Prefix all version tags with `v` (e.g., `v1.0.2`, `v0.0.6`) +- **Never commit directly to**: `stable` branch (only merge from `rel/` or `hot/` branches) +- **Before starting work**: Ensure you're on `develop` branch or create an appropriate feature branch from it + ## Project Structure - `cmd/my-log/`: Main application entrypoint - `internal/cmd/`: Cobra commands (root, drop, config)