debian-mirror-gitlab/doc/university/training/gitlab_flow.md

59 lines
1.7 KiB
Markdown
Raw Normal View History

2018-03-17 18:26:18 +05:30
---
comments: false
2019-09-04 21:01:54 +05:30
type: reference
2018-03-17 18:26:18 +05:30
---
2018-11-08 19:23:39 +05:30
# What is the GitLab Flow
2017-08-17 22:00:37 +05:30
- A simplified branching strategy
- All features and fixes first go to master
- Allows for 'production' or 'stable' branches
- Bug fixes/hot fix patches are cherry-picked from master
2018-11-08 19:23:39 +05:30
## Feature branches
2017-08-17 22:00:37 +05:30
- Create a feature/bugfix branch to do all work
- Use merge requests to merge to master
![inline](gitlab_flow/feature_branches.png)
2018-11-08 19:23:39 +05:30
## Production branch
2017-08-17 22:00:37 +05:30
- One, long-running production release branch
as opposed to individual stable branches
- Consider creating a tag for each version that gets deployed
2018-11-08 19:23:39 +05:30
## Production branch
2017-08-17 22:00:37 +05:30
![inline](gitlab_flow/production_branch.png)
2018-11-08 19:23:39 +05:30
## Release branch
2017-08-17 22:00:37 +05:30
- Useful if you release software to customers
- When preparing a new release, create stable branch
from master
- Consider creating a tag for each version
- Cherry-pick critical bug fixes to stable branch for patch release
- Never commit bug fixes directly to stable branch
2018-11-08 19:23:39 +05:30
## Release branch
2017-08-17 22:00:37 +05:30
![inline](gitlab_flow/release_branches.png)
2018-11-08 19:23:39 +05:30
## More details
2017-08-17 22:00:37 +05:30
2019-09-04 21:01:54 +05:30
For more information, read through the [GitLab Flow](../../workflow/gitlab_flow.md)
2018-11-08 19:23:39 +05:30
documentation.
2019-09-04 21:01:54 +05:30
<!-- ## Troubleshooting
Include any troubleshooting steps that you can foresee. If you know beforehand what issues
one might have when setting this up, or when something is changed, or on upgrading, it's
important to describe those, too. Think of things that may go wrong and include them here.
This is important to minimize requests for support, and to avoid doc comments with
questions that you know someone might ask.
Each scenario can be a third-level heading, e.g. `### Getting error message X`.
If you have none to add when creating a doc, leave this section in place
but commented out to help encourage others to add to it in the future. -->