From b271e8c6d2081d6a4671168fb038c1ea8dcfb42d Mon Sep 17 00:00:00 2001 From: inference Date: Wed, 15 Mar 2023 09:06:05 +0000 Subject: [PATCH 01/15] Update readme to reflect new branch structure. --- README.md | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7b3b1fa..2fb332e 100644 --- a/README.md +++ b/README.md @@ -21,12 +21,21 @@ repository.



Branches

-

dev

-

Development branch. All pre-alpha development and alpha testing happens here.
+

main

+

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

+

asset

+

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

+

blog

+

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


+

contact

+

Website contact

beta

-

Beta branch. All beta testing happens here.

+

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


stable

-

Stable branch. Complete and stable versions are stored here.
-
+

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

+
From 377d7741292679de454c1d6022d41b353f4c8561 Mon Sep 17 00:00:00 2001 From: inference Date: Wed, 15 Mar 2023 09:59:58 +0000 Subject: [PATCH 02/15] Update readme to reflect new branch structure. --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2fb332e..40928a0 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@

Licensing

-

All content is licensed under BSD-3-Clause-Clear license*.
+

All content is licensed under BSD-3-Clause-Clear license*.

*Exceptions:

    @@ -30,7 +31,11 @@ this branch.

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


    contact

    -

    Website contact +

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

    +
    +

    license

    +

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

    +

    beta

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

    From 2eb9184b4ba2a6c5c35941b091796b181ca68d9f Mon Sep 17 00:00:00 2001 From: inference Date: Wed, 15 Mar 2023 10:02:37 +0000 Subject: [PATCH 03/15] Fix license link target. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 40928a0..f1b8e65 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

    Licensing

    -

    All content is licensed under All content is licensed under BSD-3-Clause-Clear license*.

    *Exceptions:
    From d6241f73b4f0a7ed19864539b424c1cf311f332f Mon Sep 17 00:00:00 2001 From: inference Date: Wed, 15 Mar 2023 10:03:25 +0000 Subject: [PATCH 04/15] Add missing line breaks. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f1b8e65..8918173 100644 --- a/README.md +++ b/README.md @@ -24,9 +24,11 @@ repository.

    Branches

    main

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

    +

    asset

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

    +

    blog

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


    From 3d108038047fb28466fea0efa0a3057158299fd3 Mon Sep 17 00:00:00 2001 From: inference Date: Wed, 15 Mar 2023 10:12:19 +0000 Subject: [PATCH 05/15] Add hyperlink to main branch heading. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8918173..2397be7 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,8 @@ repository.



    Branches

    -

    main

    +

    main

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


    asset

    From 99e5a3db000ffe8c1145ee757de0c1534d141c69 Mon Sep 17 00:00:00 2001 From: inference Date: Wed, 15 Mar 2023 10:14:03 +0000 Subject: [PATCH 06/15] Add hyperlink to asset branch heading. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2397be7..d74c564 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,8 @@ repository.

    >main

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


    -

    asset

    +

    asset

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


    From 422ee0a224dc53c4ff51da34e76b72c3019201b9 Mon Sep 17 00:00:00 2001 From: inference Date: Wed, 15 Mar 2023 10:15:16 +0000 Subject: [PATCH 07/15] Add hyperlink to blog branch heading. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d74c564..2a35ce5 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,8 @@ repository.

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


    -

    blog

    +

    blog

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


    contact

    From 4e8d3d47b29d6e517da128f53b6f373ef0a72e2e Mon Sep 17 00:00:00 2001 From: inference Date: Wed, 15 Mar 2023 10:26:02 +0000 Subject: [PATCH 08/15] Add hyperlink to contact branch heading. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a35ce5..6185bd7 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,8 @@ this branch.

    >blog

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


    -

    contact

    +

    contact

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


    license

    From 9111aef876891feee77348a414ce6f3a98f90f32 Mon Sep 17 00:00:00 2001 From: inference Date: Wed, 15 Mar 2023 11:17:34 +0000 Subject: [PATCH 09/15] Add hyperlink to license branch heading. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6185bd7..55e0f70 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,8 @@ this branch.

    >contact

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


    -

    license

    +

    license

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


    beta

    From 8064ecf44db311cff04aa17dbf12ad80a5b1a102 Mon Sep 17 00:00:00 2001 From: inference Date: Wed, 15 Mar 2023 11:18:18 +0000 Subject: [PATCH 10/15] Add hyperlink to beta branch heading. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 55e0f70..3d2fabe 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,8 @@ this branch.

    >license

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


    -

    beta

    +

    beta

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


    From 896c6cc5da8be9a25477b13bb254b1322982ccd3 Mon Sep 17 00:00:00 2001 From: inference Date: Wed, 15 Mar 2023 11:18:56 +0000 Subject: [PATCH 11/15] Add hyperlink to stable branch heading. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3d2fabe..396f5e5 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,8 @@ this branch.

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


    -

    stable

    +

    stable

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


    From 6e7f9c2ecb6283e5e708f5197633b638a1a7a7be Mon Sep 17 00:00:00 2001 From: inference Date: Wed, 15 Mar 2023 11:21:33 +0000 Subject: [PATCH 12/15] Switch from relative path to absolute path for license link target. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 396f5e5..83504d1 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@

    Licensing

    -

    All content is licensed under All content is licensed under BSD-3-Clause-Clear license*.

    *Exceptions:
    From a0c29555f2fc6ecc28030f075bf09d6017a22b08 Mon Sep 17 00:00:00 2001 From: inference Date: Wed, 15 Mar 2023 11:23:17 +0000 Subject: [PATCH 13/15] Switch from Markdown file format to HTML file format. --- README.md => README.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README.md => README.html (100%) diff --git a/README.md b/README.html similarity index 100% rename from README.md rename to README.html From 2cff032506ce52dc1c73f9cfa33e996832e18a65 Mon Sep 17 00:00:00 2001 From: inference Date: Wed, 15 Mar 2023 11:24:16 +0000 Subject: [PATCH 14/15] Revert switching from Markdown file format to HTML file format since it breaks readme in repository in-browser. This reverts commit a0c29555f2fc6ecc28030f075bf09d6017a22b08. --- README.html => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README.html => README.md (100%) diff --git a/README.html b/README.md similarity index 100% rename from README.html rename to README.md From 99764ee334cb6c3e8e6e96400a64c48f1c998079 Mon Sep 17 00:00:00 2001 From: inference Date: Wed, 15 Mar 2023 11:27:09 +0000 Subject: [PATCH 15/15] Merge link formatting with rest of link line since Markdown file does not allow breaking HTML link targets into multiple lines. --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 83504d1..26076bf 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,7 @@

    Licensing

    -

    All content is licensed under All content is licensed under BSD-3-Clause-Clear license*.

    *Exceptions: