summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Lewis <mlewis@gitlab.com>2019-06-12 15:50:17 +0000
committerMike Lewis <mlewis@gitlab.com>2019-06-12 15:50:17 +0000
commit5a40c144e1c197ae0feec087c11888dbee4138ea (patch)
tree62e27ac8bfb68e7b62b4ebed4315d4cad1bf3c30
parent33f64473b800a8232914d54bd01c0c52cfe1c9ed (diff)
downloadgitlab-ce-5a40c144e1c197ae0feec087c11888dbee4138ea.tar.gz
Update gitlab_flow.md to add GitLab Flow video
-rw-r--r--doc/workflow/gitlab_flow.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md
index 7d0abb93262..3e24557591c 100644
--- a/doc/workflow/gitlab_flow.md
+++ b/doc/workflow/gitlab_flow.md
@@ -27,6 +27,8 @@ People have a hard time figuring out which branch has the latest code, or which
Frequently, the reaction to this problem is to adopt a standardized pattern such as [Git flow](https://nvie.com/posts/a-successful-git-branching-model/) and [GitHub flow](http://scottchacon.com/2011/08/31/github-flow.html).
We think there is still room for improvement. In this document, we describe a set of practices we call GitLab flow.
+For a video introduction of how this works in GitLab, see [GitLab Flow](https://youtu.be/InKNIvky2KE).
+
## Git flow and its problems
![Git Flow timeline by Vincent Driessen, used with permission](gitdashflow.png)