diff options
| author | Mike Lewis <mlewis@gitlab.com> | 2019-06-12 15:59:04 +0000 |
|---|---|---|
| committer | Mike Lewis <mlewis@gitlab.com> | 2019-06-12 15:59:04 +0000 |
| commit | 97d2701ffa7e1fafbfbf85c247a9b79c57fc5607 (patch) | |
| tree | 3dafa1ce31611e828634e960749cc9cd8926f0d4 /doc | |
| parent | 71d57f7f243ae033aad52d2f70e7cf7c16107a6a (diff) | |
| parent | a8a749668d33ac920fcc5fdb2bfcd9f1a0909060 (diff) | |
| download | gitlab-ce-97d2701ffa7e1fafbfbf85c247a9b79c57fc5607.tar.gz | |
Merge branch 'docs/add_gitflow_video' into 'master'
Added link to GitFlow video
See merge request gitlab-org/gitlab-ce!29517
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/gitlab-basics/README.md | 1 | ||||
| -rw-r--r-- | doc/workflow/gitlab_flow.md | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/gitlab-basics/README.md b/doc/gitlab-basics/README.md index 00ac6d6b650..0c268eff9f1 100644 --- a/doc/gitlab-basics/README.md +++ b/doc/gitlab-basics/README.md @@ -24,6 +24,7 @@ The following are guides to basic GitLab functionality: - [Add an image](add-image.md), to add new images to a project's repository. - [Create an issue](../user/project/issues/create_new_issue.md), to start collaborating within a project. - [Create a merge request](add-merge-request.md), to request changes made in a branch be merged into a project's repository. +- See how these features come together in the [GitLab Flow introduction video](https://youtu.be/InKNIvky2KE) and [GitLab Flow page](../workflow/gitlab_flow.md). ## Git basics 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  |