kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'patch-24' into 'master' 

Fixed typo in gitlab_flow.md

See merge request !12561
This commit is contained in:
Rémy Coutable 2017-07-03 12:48:02 +00:00
parent d1109bd6a7 651e32fd5a
commit c8eef2d2a6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/workflow/gitlab_flow.md
View File

@ -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
![Shell output showing git pull output](git_pull.png)