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

Fixed typo in gitlab_flow.md

Browse source
This commit is contained in:
leungpeng 2017-06-29 15:37:55 +00:00
parent 5a983ac431
commit 651e32fd5a
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 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. 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) ![Shell output showing git pull output](git_pull.png)