From 6640c5a8165829f7a726f82e7661fc1d4b1c2075 Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Wed, 12 Nov 2025 08:39:19 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9D=20Update=20Git=20Flow=20Workflow?= =?UTF-8?q?=20guidelines=20in=20AGENTS.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AGENTS.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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