Branches

Paperwork follows the GitFlow branching model (.. almost).

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.

Temporary / feature development branches:

• wip-xxxx

Bugfixes and other contributions usually go in the branch 'develop'. They may or may not be cherry-picked into the branches release-xxx and master by Paperwork maintainer (Jerome Flesch).