David20122 / sound-space-plus

Rhythm-based aim game
https://wiki.rhythia.net/
MIT License
120 stars 17 forks source link

Change Git branching strat #11

Closed atirut-w closed 1 year ago

atirut-w commented 1 year ago

I am unsure what the exact strat this project is currently using is, but I have used a similar strat in the past(main and dev branch, compared with this project's stable and nightly). as shown below:

gitGraph
commit
commit

branch nightly
commit
commit

branch pr1
commit
commit

checkout nightly
commit

checkout pr1
commit

checkout nightly
commit
merge pr1

checkout main
merge nightly tag: "Release 1"

checkout nightly
commit
commit

checkout main
merge nightly tag: "Release 2"

Note: I have no idea wtf rewrite stems from

I used to use this strat but I found this strat annoying to use and now I also find it confusing, looking at this repo and not knowing which branch I should PR into. I would like to propose using the same branching strat as Godot's repository since it is simpler to use and makes more sense in my opinion.

Godot's branching strat works by using the main branch for everything. When a new major version is released, a tag and a branch will be created from the commit used for the new major release. The branch will then be used for minor and patch releases while the master branch continues being developed.

kermeow commented 1 year ago

the branches are a remnant of Old Times stable isnt used nightly is used for the currently released version and is probably the one you want to commit to rewrite is the branch where we're rewriting the game, it stemmed from a very old nightly commit but has since had every file replaced eventually we will do something to make it simpler lol

atirut-w commented 1 year ago

So nightly is on life support/LTS while rewrite will be the new major release?

char-ptr commented 1 year ago

Currently, nightly still receives updates while rewrite is also being worked on concurrently. presumably until rewrite is closer to being ready nightly will still receive updates.

kermeow commented 1 year ago

The rewrite branch has been moved to this repo