summaryrefslogtreecommitdiff
path: root/doc/gitlab-basics
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-02-01 00:07:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-02-01 00:07:51 +0000
commit4aaadcc49070b085d63377c004c5632b6d1b2b4c (patch)
tree0d8c890fd1ce0ca22ec579a91fcd84f92c50404f /doc/gitlab-basics
parent9e83d078577a9c066f21fcef1355f800ad895c9c (diff)
downloadgitlab-ce-4aaadcc49070b085d63377c004c5632b6d1b2b4c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/gitlab-basics')
-rw-r--r--doc/gitlab-basics/feature_branch_workflow.md14
1 files changed, 9 insertions, 5 deletions
diff --git a/doc/gitlab-basics/feature_branch_workflow.md b/doc/gitlab-basics/feature_branch_workflow.md
index 06d88cf14f6..ce4aa0007c6 100644
--- a/doc/gitlab-basics/feature_branch_workflow.md
+++ b/doc/gitlab-basics/feature_branch_workflow.md
@@ -7,19 +7,23 @@ disqus_identifier: 'https://docs.gitlab.com/ee/workflow/workflow.html'
# Feature branch workflow **(FREE)**
-1. Clone project:
+To merge changes from a local branch to a feature branch, follow this workflow.
+
+1. Clone the project if you haven't already:
```shell
git clone git@example.com:project-name.git
```
-1. Create branch with your feature:
+1. Change directories so you are in the project directory.
+1. Create a branch for your feature:
```shell
git checkout -b feature_name
```
-1. Write code. Commit changes:
+1. Write code for the feature.
+1. Add the code to the staging area and add a commit message for your changes:
```shell
git commit -am "My feature is ready"
@@ -31,6 +35,6 @@ disqus_identifier: 'https://docs.gitlab.com/ee/workflow/workflow.html'
git push origin feature_name
```
-1. Review your code on commits page.
-1. Create a merge request.
+1. Review your code: On the left sidebar, go to **Repository > Commits**.
+1. [Create a merge request](../user/project/merge_requests/creating_merge_requests.md).
1. Your team lead reviews the code and merges it to the main branch.