From c10b6e3db90ec96fffec5ad3536bae8e06e6cc03 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Sun, 19 Mar 2023 16:50:21 +0200 Subject: [PATCH] docs: added info about branches --- README.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/README.md b/README.md index d4813b8..ff77aec 100644 --- a/README.md +++ b/README.md @@ -99,3 +99,32 @@ cargo run ```sh cargo build --release ``` + +## Updates strategy + +Starting from 3.2.1 ([fcab428](https://github.com/an-anime-team/an-anime-game-launcher/commit/fcab428cb40b1457f41e0856f9d1e1473acbe653)) we have 2 branches: stable ([main](https://github.com/an-anime-team/an-anime-game-launcher/tree/main)) and dev ([next](https://github.com/an-anime-team/an-anime-game-launcher/tree/next)). Code changes will be pushed into dev branch and merged into stable once they're ready for new version release + +``` + main: next: pull request: + +┌─────┐ +│3.2.1├───────────┬─────────────────┐ +└──┬──┘ │ │ + │ │ │ + │ ┌─────▼────┐ │ *checkout from both + │ │ fix: ... ├─ ── ── ── ─┤ branches accepted + │ └─────┬────┘ │ + │ │ ┌────▼────┐ + │ │ │feat: ...│ + │ ┌─────▼────┐ └────┬────┘ + │ │feat: ... │ │ + │ └─────┬────┘ │ + │ │ │ + │ ┌─────▼────┐ │ + │ │merge: ...◄────────────┘ + │ └─────┬────┘ + │ │ +┌──▼──┐ │ +│3.2.2◄───────────┘ +└─────┘ +```