diff --git a/AGENTS.md b/AGENTS.md index d40bae2..da23ac2 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -37,9 +37,10 @@ This document outlines the conventions and commands for agents operating within - **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 + - `rel/version` - Release preparation branches, merge to `stable` and then **also** merge `stable` back to `develop` + - `hot/version` - Hotfixes for production issues follow same merge rules as releases - **Version tags**: Prefix all version tags with `v` (e.g., `v1.0.2`, `v0.0.6`) - **Releases**: Update CHANGELOG.md with a summary of changes for each new version -- **Never commit directly to**: `stable` branch (only merge from `rel/` or `hot/` branches) +- **Never commit directly to** `stable` branch (only merge from `rel/` or `hot/` branches) +- After merging to `stable`, always merge it back to `develop` - **Before starting work**: Ensure you're on `develop` branch or create an appropriate feature branch from it