From 6457c12f65e8898d12b7928d1a197dd5635a0a4b Mon Sep 17 00:00:00 2001 From: inference Date: Wed, 5 Apr 2023 06:53:55 +0100 Subject: [PATCH] Further detail branch purposes and merging strategies. --- README.md | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 98094b7..0e99e4e 100644 --- a/README.md +++ b/README.md @@ -24,32 +24,41 @@ repository.

Branches

main

-

Website root directory files pre-alpha development and alpha testing happens in this branch.

+

Website root directory files pre-alpha development and alpha testing happens in this branch.
+Feature-complete modifications of this branch are merged to beta branch for beta testing.


asset

Website asset, including multimedia, files pre-alpha development and alpha testing happens in -this branch.

+this branch.
+Feature-complete modifications of this branch are merged to beta branch for beta testing.


blog

-

Website blog files pre-alpha development and alpha testing happens in this branch.

+

Website blog files pre-alpha development and alpha testing happens in this branch.
+Feature-complete modifications of this branch are merged to beta branch for beta testing.


contact

-

Website contact files pre-alpha development and alpha testing happens in this branch.

+

Website contact files pre-alpha development and alpha testing happens in this branch.
+Feature-complete modifications of this branch are merged to beta branch for beta testing.


license

-

Website license files pre-alpha and alpha testing happens in this branch.

+

Website license files pre-alpha and alpha testing happens in this branch.
+Feature-complete modifications of this branch are merged to beta branch for beta testing.


beta

Feature-complete beta testing of merged code from development branches happens in this -branch.

+branch.
+Merges from development branches to this branch are squashed, and the updated versions of the +individual files are mentioned in the commit messages.


stable

-

Completed and tested versions from beta branch are stored in this branch.
-This branch contains files used in production.

+

Feature-complete and tested versions from beta branch are stored in this branch.
+Merges from beta branch to this branch are squashed, and the updated versions of the individual +files are mentioned in the commit messages.
+This branch contains code used in production.