Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
legTools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
leg
legTools
Commits
1335a83a
Commit
1335a83a
authored
9 years ago
by
Fernando Mayer
Browse files
Options
Downloads
Patches
Plain Diff
Rewrite information about the release branch
parent
1ae0b462
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
CONTRIBUTING.md
+5
-5
5 additions, 5 deletions
CONTRIBUTING.md
with
5 additions
and
5 deletions
CONTRIBUTING.md
+
5
−
5
View file @
1335a83a
...
@@ -16,11 +16,11 @@ two links: [A successful Git branching model][], and
...
@@ -16,11 +16,11 @@ two links: [A successful Git branching model][], and
Basically, all the ongoing development is made in the
`devel`
Basically, all the ongoing development is made in the
`devel`
branch. New features and bug fixes are made in additional (parallell)
branch. New features and bug fixes are made in additional (parallell)
branches such like
`feature/<num>`
, where
`<num>`
is an incremental
branches such like
`feature/<num>`
, where
`<num>`
is an incremental
number. Feature branches are merged with the
`devel`
branch
. When a new
number. Feature branches are merged with the
`devel`
branch
, where final
version is supposed to be ready for release,
it is moved to the
tests are made to guarantee it is stable. Only then
it is moved to the
`
release
`
branch, where
final tests are made to guarantee it is
`
master
`
branch, where
it receives a tag with the version number. Note
stable. Only then it is moved to the
`master`
branch, where it receives
that we don't use a
`release`
branch as in a traditional Gitflow
a tag with the version number
.
workflow (this is the only difference)
.
This way, users may opt to install the stable version, from the
`master`
This way, users may opt to install the stable version, from the
`master`
branch, or they may install the development version from the
`devel`
branch, or they may install the development version from the
`devel`
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment