Git Branching Scheme

Use these names for your Git branches.

Topic branches

Use the format user/issue/topic.

userYour GitHub usernamervlIf branch is a shared effort and issue is provided.
issueJira issue key or GitHub issue numberADP-123, 1234If username and/or issue are provided.
topicSome description of the branchadd-fooIf issue is provided.

Release branches

We release from the mainline branch, and therefore don’t use release branches.

This lowers maintenance overheads, but requires that we always keep master in a releaseable state.

Release preparation branches

According to the Release Checklist, these are of the form your-name/bump-release/YYYY-MM-DD.

Mainline branch

Mainline branch is master - for consistency.