diff options
| author | Ray Paik <rpaik@gitlab.com> | 2019-09-12 02:45:57 +0000 |
|---|---|---|
| committer | Ray Paik <rpaik@gitlab.com> | 2019-09-12 02:45:57 +0000 |
| commit | a52935fbd8132180f19fa27dc397c14087b5d936 (patch) | |
| tree | 8e53f1a4f6e05b111fa9ab60b89f41b85b6cd17e /doc | |
| parent | 1cef292cd130c6b1ea438e1b5f2944ccddd6ffb7 (diff) | |
| parent | 2f236c206e04342f9b8445cef60e136a5cffecdc (diff) | |
| download | gitlab-ce-a52935fbd8132180f19fa27dc397c14087b5d936.tar.gz | |
Merge branch 'patch-72' into 'master'
Update a dead external link in documentation
See merge request gitlab-org/gitlab-ce!32939
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/workflow/gitlab_flow.md | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md index 2f365e42cc9..136e05281a6 100644 --- a/doc/workflow/gitlab_flow.md +++ b/doc/workflow/gitlab_flow.md @@ -1,4 +1,3 @@ - # Introduction to GitLab Flow  @@ -60,7 +59,7 @@ For example, many projects do releases but don't need to do hotfixes. In reaction to Git flow, GitHub created a simpler alternative. [GitHub flow](https://guides.github.com/introduction/flow/index.html) has only feature branches and a `master` branch. This flow is clean and straightforward, and many organizations have adopted it with great success. -Atlassian recommends [a similar strategy](https://www.atlassian.com/blog/archives/simple-git-workflow-simple), although they rebase feature branches. +Atlassian recommends [a similar strategy](https://www.atlassian.com/blog/git/simple-git-workflow-is-simple), although they rebase feature branches. Merging everything into the `master` branch and frequently deploying means you minimize the amount of unreleased code, which is in line with lean and continuous delivery best practices. However, this flow still leaves a lot of questions unanswered regarding deployments, environments, releases, and integrations with issues. With GitLab flow, we offer additional guidance for these questions. |