diff options
| author | Nick <nick.volynkin@gmail.com> | 2016-08-20 09:04:37 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-23 17:02:58 +0200 |
| commit | 453bf1543e56638117dd73f952be7f7fda285dee (patch) | |
| tree | de0accd6a5b99b72427db577f2b6c8607a508820 | |
| parent | 9b079219730516ae971a4cdc0d68f75b99ff4de1 (diff) | |
| download | gitlab-ce-fix-typo-in-gitlab-flow.tar.gz | |
Fix typo in gitlab_flow.mdfix-typo-in-gitlab-flow
| -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 2b2f140f8bf..8119324bb62 100644 --- a/doc/workflow/gitlab_flow.md +++ b/doc/workflow/gitlab_flow.md @@ -89,7 +89,7 @@ In this case the master branch is deployed on staging. When someone wants to dep And going live with code happens by merging the pre-production branch into the production branch. This workflow where commits only flow downstream ensures that everything has been tested on all environments. If you need to cherry-pick a commit with a hotfix it is common to develop it on a feature branch and merge it into master with a merge request, do not delete the feature branch. -If master is good to go (it should be if you a practicing [continuous delivery](http://martinfowler.com/bliki/ContinuousDelivery.html)) you then merge it to the other branches. +If master is good to go (it should be if you are practicing [continuous delivery](http://martinfowler.com/bliki/ContinuousDelivery.html)) you then merge it to the other branches. If this is not possible because more manual testing is required you can send merge requests from the feature branch to the downstream branches. An 'extreme' version of environment branches are setting up an environment for each feature branch as done by [Teatro](https://teatro.io/). |