Уточнено правило завершения работы в fix и feat ветках
This commit is contained in:
@@ -34,8 +34,8 @@ Approval/clarification:
|
|||||||
- Branch (`fix/*` or `feat/*`): ask once before the first file-changing task that may lead to commit; reuse decision for all subsequent tasks in same dialogue.
|
- Branch (`fix/*` or `feat/*`): ask once before the first file-changing task that may lead to commit; reuse decision for all subsequent tasks in same dialogue.
|
||||||
|
|
||||||
After work in `fix/*` or `feat/*`:
|
After work in `fix/*` or `feat/*`:
|
||||||
1. MR → main
|
1. merge changes directly into `main` and delete the source branch
|
||||||
2. merge → main + delete branch
|
2. create PR/MR targeting `main`
|
||||||
|
|
||||||
Push failure:
|
Push failure:
|
||||||
- retry ≤2 times, 3s delay
|
- retry ≤2 times, 3s delay
|
||||||
|
|||||||
Reference in New Issue
Block a user