mirror of
https://github.com/jimeh/common-flow.git
synced 2026-02-19 09:26:40 +00:00
Updated summary rules
This commit is contained in:
@@ -23,7 +23,8 @@ Branch types:
|
|||||||
|
|
||||||
Rules:
|
Rules:
|
||||||
|
|
||||||
- The `master` branch should always be deployable / usable.
|
- The `master` branch should always be deployable / usable, while considered to
|
||||||
|
be "bleeding edge".
|
||||||
- New work must be done on a descriptively named change branch created off of
|
- New work must be done on a descriptively named change branch created off of
|
||||||
`master`.
|
`master`.
|
||||||
- Commit to the change branch locally, and regularly push your work to the same
|
- Commit to the change branch locally, and regularly push your work to the same
|
||||||
@@ -34,6 +35,8 @@ Rules:
|
|||||||
in to `master`.
|
in to `master`.
|
||||||
- New releases are created by committing a version bump commit directly to
|
- New releases are created by committing a version bump commit directly to
|
||||||
`master`, and then tagging that commit with the version.
|
`master`, and then tagging that commit with the version.
|
||||||
|
- Maintenance branches are updated by manually merging and/or backporting
|
||||||
|
relevant change branches in to them.
|
||||||
|
|
||||||
Git Common-Flow Specification (Common-Flow)
|
Git Common-Flow Specification (Common-Flow)
|
||||||
-------------------------------------------
|
-------------------------------------------
|
||||||
|
|||||||
Reference in New Issue
Block a user