Re: Next release from master

[Teemu Likonen]

(cl-incf option)

  - master: This is the release branch for versions with new features.
    Releases are Git-tagged: emacs-25.1. After the release new features
    are added or merged here (see feature branches below).

  - maint: When a release happens from master the master branch is
    merged here. Bug fixes are added here (if a bug fix release is
    planned). Releases are Git-tagged: emacs-25.2. This branch is merged
    to master occasionally.

  - next: Wild zone and test branch for new features. Feature branches
    (see below) and the master branch are merged here. This is never
    merged anywhere. Maybe a cleanup sometimes: "git reset --hard
    master".

  - [any feature-specific branch]: There can be any number of
    feature-specific branches for new features. These are merged to next
    when a wider testing is wanted. When feature is ready and the master
    is open these are merged to master (and can be discarded).

From users' and downstream point of view: Those who always want the most
stable version will follow "maint". Those who want the normal next
release branch will follow "master". For testing the latest features one
would use "next" or manually merge any feature branches to one's own.

-- 
/// Teemu Likonen   - .-..   <https://github.com/tlikonen> //
// PGP: 4E10 55DC 84E9 DFF6 13D7 8557 719D 69D3 2453 9450 ///

signature.asc
Description: PGP signature