diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-03 12:48:02 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-03 12:48:02 +0000 |
| commit | c8eef2d2a62f6ac7304c8ab4d50282613e21ec8a (patch) | |
| tree | 8c7330036c81662ad385a3d65b5ac07b9009bf93 | |
| parent | d1109bd6a72903a733530a9f605596eab62f4146 (diff) | |
| parent | 651e32fd5ae382e6afa3a46993b0f62659b35f6d (diff) | |
| download | gitlab-ce-c8eef2d2a62f6ac7304c8ab4d50282613e21ec8a.tar.gz | |
Merge branch 'patch-24' into 'master'
Fixed typo in gitlab_flow.md
See merge request !12561
| -rw-r--r-- | doc/workflow/gitlab_flow.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md index e10ccc4fc46..ea28968fbb2 100644 --- a/doc/workflow/gitlab_flow.md +++ b/doc/workflow/gitlab_flow.md @@ -300,7 +300,7 @@ If there are no merge conflicts and the feature branches are short lived the ris If there are merge conflicts you merge the master branch into the feature branch and the CI server will rerun the tests. If you have long lived feature branches that last for more than a few days you should make your issues smaller. -## Working wih feature branches +## Working with feature branches  |