diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-23 12:08:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-23 12:08:48 +0000 |
| commit | 8137303e47baaff97a36396cfb05efc0d99879a2 (patch) | |
| tree | 89dc777fd2d63e259e4b8b2d781baf472d3429a0 /doc/topics | |
| parent | 5b1258ee90fb29779d6c9da3f488ebff61e243a3 (diff) | |
| download | gitlab-ce-8137303e47baaff97a36396cfb05efc0d99879a2.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/topics')
| -rw-r--r-- | doc/topics/gitlab_flow.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/topics/gitlab_flow.md b/doc/topics/gitlab_flow.md index 89ab5e1cf2e..1735810c3cc 100644 --- a/doc/topics/gitlab_flow.md +++ b/doc/topics/gitlab_flow.md @@ -113,7 +113,7 @@ While this is possible in some cases, such as SaaS applications, there are some operations team is at full capacity - but you also merge code at other times. In these cases, you can create a production branch that reflects the deployed code. -You can deploy a new version by merging `main` into the `production` branch. +You can deploy a new version by merging `main` into the `production` branch. While not shown in the graph below, the work on the `main` branch works just like in GitHub flow, i.e. with feature-branches being merged into `main`. ```mermaid |