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

Update and fix wording in terminology section

Browse Source
This commit is contained in:
Jim Myhrberg
2017-07-02 19:12:21 +01:00
parent 916e130551
commit a6318ab0bc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common-flow.md
View File

@@ -26,8 +26,8 @@ Terminology
changes in the source branch should be incorporated into the change branch via changes in the source branch should be incorporated into the change branch via
rebasing. rebasing.
- **Merge Target** - A branch that is the intended merge target for a change - **Merge Target** - A branch that is the intended merge target for a change
branch. Typically the merge target will be the branch that a change branch was branch. Typically the merge target branch will be the same as the source
created from. branch.
- **Maintenance Branches** - Used for maintaining old versions and releasing - **Maintenance Branches** - Used for maintaining old versions and releasing
PATCH updates when the master branch has moved on. Should follow a PATCH updates when the master branch has moved on. Should follow a
`stable-X.Y` naming pattern, where `X` is MAJOR version and `Y` is MINOR `stable-X.Y` naming pattern, where `X` is MAJOR version and `Y` is MINOR
@@ -35,7 +35,7 @@ Terminology
- **Pull Request** - A means of requesting that a change branch is merged in to - **Pull Request** - A means of requesting that a change branch is merged in to
its merge target, allowing others to review, discuss and approve the changes. its merge target, allowing others to review, discuss and approve the changes.
- **Release** - Consists of a version bump commit directly on the master branch, - **Release** - Consists of a version bump commit directly on the master branch,
and a git tag named according to the new version number placed on said commit. and a git tag named according to the new version string placed on said commit.
- **Maintenance Release** - Just like a regular release, except the version bump - **Maintenance Release** - Just like a regular release, except the version bump
commit and release tag are on a maintenance branch instead of the master commit and release tag are on a maintenance branch instead of the master
branch. branch.