Skip to content

Commit

Permalink
Merge branch 'develop' into feature/gh-3-branch-naming-conventions-an…
Browse files Browse the repository at this point in the history
…d-guidelines
  • Loading branch information
arcticicestudio committed Jul 24, 2017
2 parents d7da6bd + 89924cb commit 2206f37
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,19 @@ Every branch must contain *issue ID* which is important to automatically fire so

A `release` branch is used to prepare a new [tagged](#tags) release version.

## Tags

Arctic Ice Studio follows the [gitflow][gitflow] branching model with the deviations and additional conventions described below using the [Arctic Versioning Specification][arcver].

All version tags are created in the `master` [core branch](#core-branches) to specify which commits reflects a release version as defined by the `release` [branch name](#branch-naming) prefix.

* **Only use annotated tags**. Allows to include the name of the project followed by the version number to the commit message.
* **Always add the `v` prefix character to version tags**. Clarifies the tag type as specified by ArcVer.
* **Every version tag must be signed**. Ensures that the version has been tested and approved by the project owner or an authorized project contributor.

---

<p align="center">Copyright &copy; 2017 Arctic Ice Studio<br><a href="http://www.apache.org/licenses/LICENSE-2.0"><img src="https://img.shields.io/badge/License-Apache_2.0-5E81AC.svg?style=flat-square"/></a></p>

[arcver]: https://github.com/arcticicestudio/arcver
[gitflow]: http://nvie.com/posts/a-successful-git-branching-model

0 comments on commit 2206f37

Please sign in to comment.