Commit 651e32fd authored by leungpeng's avatar leungpeng

Fixed typo in gitlab_flow.md

parent 5a983ac4
...@@ -300,7 +300,7 @@ If there are no merge conflicts and the feature branches are short lived the ris ...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment