From 4da26911fe2d4e000ba4fa8772f5867664ff18ee Mon Sep 17 00:00:00 2001 From: Shahovalov MIkhail Date: Thu, 9 Apr 2026 07:53:33 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D1=82=D0=BE=D1=87=D0=BD=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BF=D0=BE=D0=BB=D0=B8=D1=82=D0=B8=D0=BA=D1=83=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=82=D0=BE=D0=BA:=20=D0=BF=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D0=BB=D0=B0=D0=B3=D0=B0=D1=82=D1=8C=20=D0=B2=D0=B5=D1=82=D0=BA?= =?UTF-8?q?=D1=83=20=D0=B2=20=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=B5=20=D0=B8?= =?UTF-8?q?=20MR/merge=20=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=86=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AGENTS.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 43c0d3f..02d3140 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -55,8 +55,10 @@ ## Git Collaboration Policy (MUST) - Ask user permission before commit. - After approval: commit and push immediately. -- Significant work: propose separate `feat/*` or `fix/*` branch. -- After finishing `feat/*` or `fix/*`: propose merge back to `main`. +- At the start of each new fix/feature task: propose switching to a dedicated `fix/*` or `feat/*` branch. +- After finishing work in `fix/*` or `feat/*`: propose either + 1. creating an MR into `main`, or + 2. merging to `main` immediately and deleting the `fix/*`/`feat/*` branch. - Commit messages and comments: Russian. - Commit message content: what was done (not what should be done). - If push fails: retry up to 2 more times with 3s pause.