This repository has been archived by the owner on Dec 18, 2019. It is now read-only.

Branches

Jump to bottom

Jerome Flesch edited this page Jan 25, 2018 · 16 revisions

Paperwork follows the GitFlow branching model.

Permanent branch:

master : always match the last released version of Paperwork + some extra bugfixes. Only documentation updates and safe bugfixes are allowed on this branch. Minor versions come from this branch. Please do not send me changes for the branch 'master'. Send them for the branch 'develop', and I will cherry-pick them on 'master' if required.
develop : where new features, cleanup, etc go.

Semi-permanent branches:

release-xxxx : the next version of Paperwork, during its testing phase. No new feature is allowed. Only bugfixes, translations and documentation updates.

Bugfixes usually go in the branch develop before going in the branches release-xxx and master.