jimeh/common-flow
1
0
Fork 0
mirror of https://github.com/jimeh/common-flow.git synced 2026-02-19 09:26:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add proper Summary section

Browse Source
This commit is contained in:
Jim Myhrberg
2017-12-29 01:33:03 +00:00
parent b7a264b37a
commit 4c68267fb2
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common-flow.md
View File

@@ -34,6 +34,20 @@ Terminology
- **Release Branches** - Used both for short-term preparations of a release, and - **Release Branches** - Used both for short-term preparations of a release, and
also for long-term maintenance of older version. also for long-term maintenance of older version.
Summary
-------
- The "master" branch is the mainline branch with latest changes, and must not
be broken.
- Changes (features, bugfixes, etc.) are done on "change branches" created from
the master branch.
- [Rebase early and often.](https://i.imgur.com/1RS8x2d.png)
- When a change branch is stable and ready, it is merged back in to master.
- A release is just a git tag who's name is the exact release version string
(e.g. "2.11.4").
- Release branches can be used to avoid a change freezes on master. They are not
required, instead they are available if you do need them.
Git Common-Flow Specification (Common-Flow) Git Common-Flow Specification (Common-Flow)
------------------------------------------- -------------------------------------------