~bzg/worg

bd06cfbc58315662a803d9c5f8d1e3ba49ae68fd — Michael Eliachevitch 15 days ago cc46f18
Use new `main` and `bugfix` branch names in developer documentation
1 files changed, 14 insertions(+), 14 deletions(-)

M dev/index.org
M dev/index.org => dev/index.org +14 -14
@@ 23,20 23,20 @@ tutorials on how to extend Org.

Org development uses a two-branches git workflow.

- master :: This branch contains the latest development for Org.
            Temporary feature branches (either local or remote) should
            branch out from =master=.  New features should be introduced
            into org on master.  This branch is merged to the =maint=
            branch when a major release is made.

- maint :: 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 =maint=,
           which is then merged back into =master= so that the two
           branches keep the same bugfixes.  Minor releases are made
           so that not too many bug fixes are pending on maint.  The
           Org version on this branch is regularly sync'ed with the
           Emacs repository.
- 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.

** Git repositories