diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-09-27 14:28:22 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-09-27 14:28:22 +0000 |
| commit | 024249621fd1efbad611bad32f0e171854a4cdb4 (patch) | |
| tree | 4da005a265d621d67abffe7a0def7df1457decd6 | |
| parent | 8be814c7cdada5e5072185e9687910e54f91c53e (diff) | |
| parent | 147cbb95f5ffc0d70ab8f0fc573f0847fc90b3f3 (diff) | |
| download | gitlab-ce-024249621fd1efbad611bad32f0e171854a4cdb4.tar.gz | |
Merge branch '36072-remove-big-mrs-sections' into 'master'
Removes section about big MRs
See merge request gitlab-org/gitlab-ce!14520
| -rw-r--r-- | doc/development/fe_guide/index.md | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/doc/development/fe_guide/index.md b/doc/development/fe_guide/index.md index d84801f91d4..031b12a8e91 100644 --- a/doc/development/fe_guide/index.md +++ b/doc/development/fe_guide/index.md @@ -29,34 +29,6 @@ For our currently-supported browsers, see our [requirements][requirements]. ## Development Process -When you are assigned an issue please follow the next steps: - -### Divide a big feature into small Merge Requests -1. Big Merge Request are painful to review. In order to make this process easier we -must break a big feature into smaller ones and create a Merge Request for each step. -1. First step is to create a branch from `master`, let's call it `new-feature`. This branch -will be the recipient of all the smaller Merge Requests. Only this one will be merged to master. -1. Don't do any work on this one, let's keep it synced with master. -1. Create a new branch from `new-feature`, let's call it `new-feature-step-1`. We advise you -to clearly identify which step the branch represents. -1. Do the first part of the modifications in this branch. The target branch of this Merge Request -should be `new-feature`. -1. Once `new-feature-step-1` gets merged into `new-feature` we can continue our work. Create a new -branch from `new-feature`, let's call it `new-feature-step-2` and repeat the process done before. - -```shell -master -└─ new-feature - ├─ new-feature-step-1 - ├─ new-feature-step-2 - └─ new-feature-step-3 -``` - -**Tips** -- Make sure `new-feature` branch is always synced with `master`: merge master frequently. -- Do the same for the feature branch you have opened. This can be accomplished by merging `master` into `new-feature` and `new-feature` into `new-feature-step-*` -- Avoid rewriting history. - ### Share your work early 1. Before writing code guarantee your vision of the architecture is aligned with GitLab's architecture. |