~akspecs/aqoli-docs

262607f9c3c0fedbee9182d529f2335a9a0f692e — Andrei Khartchenko 8 months ago dcd0fb7
add repo-organization.txt
1 files changed, 48 insertions(+), 0 deletions(-)

A docs/repo-organization.txt
A docs/repo-organization.txt => docs/repo-organization.txt +48 -0
@@ 0,0 1,48 @@
repo-organization.txt

currently we have two mostly unrelated branches (prior to 2021-11-28):

  master:  a few commits with react + django, which we have scrapped

  development:  drafts of our quiz + quiz results page (committed by rebecca)


todo:

 - rename master -> master-old, add a note re: abandoned status

 - the development branch will now be the default branch

 - have all pull requests/patches go to the development branch

 - create new master/release branch that contains working/tagged versions of
   the site
   - e.g. (version) tag/ref 2021.11.28
                            2021.11.28.2 (if we happen to add another release /
                            tag on the same day as another)
                            2021.11.30
                            ...
                            2021.12.08


 - overview of our new repo organization:

                  2021.11.28     2021.11.30         2021.12.04       2021.12.08
   - master/release ---o--------------o------------------o----------------o----
                      /
                     /
   - (temp)  proposed-release-2021.11.28  [rebased/branched from development,
                          /                with commits squashed into one
                         /                 versioned release commit]
                        /
   - development --o---o-o--o-----o--o-o----o------o---o---o-------o-----------
                        \                  /
                         \                /  [when working from your fork, be
   - (temp) feature/name  o--o--o----o---o    sure to conduct work from a temp.
                                              feature branch (branch off from
                                              the development branch), and
                                              submit pull requests from your
                                              fork's feature branch to
                                              upstream's development branch]

   - master-old (abandoned) --o----o----o