Closed atirut-w closed 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
So nightly
is on life support/LTS while rewrite
will be the new major release?
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.
I am unsure what the exact strat this project is currently using is, but I have used a similar strat in the past(
main
anddev
branch, compared with this project'sstable
andnightly
). as shown below:Note: I have no idea wtf
rewrite
stems fromI 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.