Commit 807e1553 authored by Mike Jang's avatar Mike Jang

Merge branch 'docs-ff-step' into 'master'

Clarify adding of a new flag

See merge request gitlab-org/gitlab!48450
parents bf916777 28efe2dc
...@@ -32,7 +32,8 @@ should be leveraged: ...@@ -32,7 +32,8 @@ should be leveraged:
requests, you can use the following workflow: requests, you can use the following workflow:
1. [Create a new feature flag](development.md#create-a-new-feature-flag) 1. [Create a new feature flag](development.md#create-a-new-feature-flag)
which is **off** by default, in the first merge request. which is **off** by default, in the first merge request which uses the flag.
Flags [should not be added separately](development.md#risk-of-a-broken-master-main-branch).
1. Submit incremental changes via one or more merge requests, ensuring that any 1. Submit incremental changes via one or more merge requests, ensuring that any
new code added can only be reached if the feature flag is **on**. new code added can only be reached if the feature flag is **on**.
You can keep the feature flag enabled on your local GDK during development. You can keep the feature flag enabled on your local GDK during development.
......
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