Commit a9af2e5d83179f2b596b9ae6fba5cf0527bd4058
Exists in
spb-stable
and in
3 other branches
Merge pull request #6667 from Razer6/update_workflow_doc
Improve doc/workflow.md for doc.gitlab.com
Showing
1 changed file
with
4 additions
and
3 deletions
Show diff stats
doc/workflow/workflow.md
| @@ -3,24 +3,25 @@ | @@ -3,24 +3,25 @@ | ||
| 3 | ```bash | 3 | ```bash |
| 4 | git clone git@example.com:project-name.git | 4 | git clone git@example.com:project-name.git |
| 5 | ``` | 5 | ``` |
| 6 | + | ||
| 6 | 2. Create branch with your feature | 7 | 2. Create branch with your feature |
| 7 | 8 | ||
| 8 | ```bash | 9 | ```bash |
| 9 | git checkout -b $feature_name | 10 | git checkout -b $feature_name |
| 10 | ``` | 11 | ``` |
| 11 | 12 | ||
| 12 | -3. Write code. Comit changes | 13 | +3. Write code. Commit changes |
| 13 | 14 | ||
| 14 | ```bash | 15 | ```bash |
| 15 | git commit -am "My feature is ready" | 16 | git commit -am "My feature is ready" |
| 16 | ``` | 17 | ``` |
| 17 | 18 | ||
| 18 | 4. Push your branch to GitLab | 19 | 4. Push your branch to GitLab |
| 19 | - | 20 | + |
| 20 | ```bash | 21 | ```bash |
| 21 | git push origin $feature_name | 22 | git push origin $feature_name |
| 22 | ``` | 23 | ``` |
| 23 | 24 | ||
| 24 | -5. Review your code on Commits page | 25 | +5. Review your code on commits page |
| 25 | 6. Create a merge request | 26 | 6. Create a merge request |
| 26 | 7. Your team lead will review the code & merge it to the main branch | 27 | 7. Your team lead will review the code & merge it to the main branch |