Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
FSL
fslpy
Commits
c74de29c
Commit
c74de29c
authored
Jun 03, 2017
by
Paul McCarthy
🚵
Browse files
Merge branch 'master' into 'master'
Tweaks to contributing guide See merge request !19
parents
b67d65d4
145394e2
Pipeline
#531
canceled with stage
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
doc/contributing.rst
View file @
c74de29c
...
...
@@ -51,19 +51,20 @@ Releases
A separate branch is created for each **minor** release. The name of the
branch is ``v[major.minor]``, where ``[major.minor]`` is the first two
components of the release version number (see
below
). For example, the branch
components of the release version number (see
above
). For example, the branch
name for minor release ``1.0`` would be ``v1.0``.
Patches and hotfixes may be added to these release branches. These should be
merged into the master branch, and then cherry-picked onto the release
branch(es).
Patches and bugfixes may be added to these release branches as ``point``
releases. These changes should be made on the master branch like any other
change (i.e. via merge requests), and then cherry-picked onto the relevant
release branch(es).
Every release is also tagged with its full version number. For
example, the
first release off the ``v1.0`` branch would be tagged with
``1.0.0``.
Maintenance
release to the ``v1.0`` branch would be tagged with
``1.0.1``,
``1.0.2``, etc.
Every release
commit
is also tagged with its full version number. For
example, the
first release off the ``v1.0`` branch would be tagged with
``1.0.0``. Point
release
s
to the ``v1.0`` branch would be tagged with
``1.0.1``,
``1.0.2``, etc.
Testing
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment