Inferencium/website
1
0
Fork 0
Code Issues Activity

Further detail branch purposes and merging strategies.

Browse Source
This commit is contained in:
inference 2023-04-05 06:53:55 +01:00
parent df5136e303
commit 6457c12f65
Signed by: inference
SSH Key Fingerprint: SHA256:9Pl0nZ2UJacgm+IeEtLSZ4FOESgP1eKCtRflfPfdX9M
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
README.md
View File

@ -24,32 +24,41 @@ repository.</p>
<h2>Branches</h2> <h2>Branches</h2>
<h3><a href="https://git.inferencium.net/Inferencium/website/src/branch/main/" <h3><a href="https://git.inferencium.net/Inferencium/website/src/branch/main/"
>main</a></h3> >main</a></h3>
<p>Website root directory files pre-alpha development and alpha testing happens in this branch.</p> <p>Website root directory files pre-alpha development and alpha testing happens in this branch.<br>
Feature-complete modifications of this branch are merged to beta branch for beta testing.</p>
<br> <br>
<h3><a href="https://git.inferencium.net/Inferencium/website/src/branch/asset/" <h3><a href="https://git.inferencium.net/Inferencium/website/src/branch/asset/"
>asset</a></h3> >asset</a></h3>
<p>Website asset, including multimedia, files pre-alpha development and alpha testing happens in <p>Website asset, including multimedia, files pre-alpha development and alpha testing happens in
this branch.</p> this branch.<br>
Feature-complete modifications of this branch are merged to beta branch for beta testing.</p>
<br> <br>
<h3><a href="https://git.inferencium.net/Inferencium/website/src/branch/blog/" <h3><a href="https://git.inferencium.net/Inferencium/website/src/branch/blog/"
>blog</a></h3> >blog</a></h3>
<p>Website blog files pre-alpha development and alpha testing happens in this branch.</p> <p>Website blog files pre-alpha development and alpha testing happens in this branch.<br>
Feature-complete modifications of this branch are merged to beta branch for beta testing.</p>
<br> <br>
<h3><a href="https://git.inferencium.net/Inferencium/website/src/branch/contact/" <h3><a href="https://git.inferencium.net/Inferencium/website/src/branch/contact/"
>contact</a></h3> >contact</a></h3>
<p>Website contact files pre-alpha development and alpha testing happens in this branch.</p> <p>Website contact files pre-alpha development and alpha testing happens in this branch.<br>
Feature-complete modifications of this branch are merged to beta branch for beta testing.</p>
<br> <br>
<h3><a href="https://git.inferencium.net/Inferencium/website/src/branch/license/" <h3><a href="https://git.inferencium.net/Inferencium/website/src/branch/license/"
>license</a></h3> >license</a></h3>
<p>Website license files pre-alpha and alpha testing happens in this branch.</p> <p>Website license files pre-alpha and alpha testing happens in this branch.<br>
Feature-complete modifications of this branch are merged to beta branch for beta testing.</p>
<br> <br>
<h3><a href="https://git.inferencium.net/Inferencium/website/src/branch/beta/" <h3><a href="https://git.inferencium.net/Inferencium/website/src/branch/beta/"
>beta</a></h3> >beta</a></h3>
<p>Feature-complete beta testing of merged code from development branches happens in this <p>Feature-complete beta testing of merged code from development branches happens in this
branch.</p> branch.<br>
Merges from development branches to this branch are squashed, and the updated versions of the
individual files are mentioned in the commit messages.</p>
<br> <br>
<h3><a href="https://git.inferencium.net/Inferencium/website/src/branch/stable/" <h3><a href="https://git.inferencium.net/Inferencium/website/src/branch/stable/"
>stable</a></h3> >stable</a></h3>
<p>Completed and tested versions from beta branch are stored in this branch.<br> <p>Feature-complete and tested versions from beta branch are stored in this branch.<br>
This branch contains files used in production.</p> Merges from beta branch to this branch are squashed, and the updated versions of the individual
files are mentioned in the commit messages.<br>
This branch contains code used in production.</p>
<br> <br>