Next: All Org Code, Up: Resources [Index]
Org development uses a two-branches git workflow.
main ::
This branch contains the latest development for Org. Temporary feature branches (either local or remote) should branch out from main. New features should be introduced into org on main. This branch is merged to the bugfix branch when a major release is made.
bugfix ::
This branch is the "production" branch for Org. It contains stable releases and bug fixes against them. Bugs present in a release should always be fixed on bugfix, which is then merged back into main so that the two branches keep the same bugfixes. Minor releases are made so that not too many bug fixes are pending on bugfix. The Org version on this branch is regularly sync’ed with the Emacs repository.