1
0
mirror of git://f0xx.org/android_cast synced 2026-07-29 03:57:50 +03:00

EB of git flow

This commit is contained in:
Anton Afanasyeu
2026-05-23 12:36:31 +02:00
parent a5ee5d7140
commit aa05e8e39c
19 changed files with 340 additions and 177 deletions

View File

@@ -24,7 +24,7 @@ Follow [docs/GIT_FLOW.md](docs/GIT_FLOW.md) and [docs/GIT_FLOW.pdf](docs/GIT_FLO
4. **Release:** only after user confirms — merge `next` → `master`, CI green, **tag on master**, then **merge master → next**.
5. **Hotfix (production):** branch from **master**, not next; after tag, **merge master into next**.
6. **Hotfix (next-only bug):** `fix/*` from **next** → merge to **next** only.
7. **Never** force-push `master` or `next`.
7. **Never** force-push `master`; force-push `next` only when the user explicitly requests history rewrite on integration.
8. When working on a named branch, call **SetActiveBranch** with that branch name.
## Quick commands