diff options
Diffstat (limited to 'doc/gitlab-basics')
| -rw-r--r-- | doc/gitlab-basics/README.md | 1 | ||||
| -rw-r--r-- | doc/gitlab-basics/feature_branch_workflow.md | 35 |
2 files changed, 36 insertions, 0 deletions
diff --git a/doc/gitlab-basics/README.md b/doc/gitlab-basics/README.md index 301b48900a8..258a85d0474 100644 --- a/doc/gitlab-basics/README.md +++ b/doc/gitlab-basics/README.md @@ -23,6 +23,7 @@ The following are guides to basic GitLab functionality: - [Create a group](../user/group/index.md#create-a-new-group), to combine and administer projects together. - [Create a branch](create-branch.md), to make changes to files stored in a project's repository. +- [Feature branch workflow](feature_branch_workflow.md). - [Fork a project](fork-project.md), to duplicate projects so they can be worked on in parallel. - [Add a file](add-file.md), to add new files to a project's repository. - [Create an issue](../user/project/issues/managing_issues.md#create-a-new-issue), diff --git a/doc/gitlab-basics/feature_branch_workflow.md b/doc/gitlab-basics/feature_branch_workflow.md new file mode 100644 index 00000000000..2b641126d0d --- /dev/null +++ b/doc/gitlab-basics/feature_branch_workflow.md @@ -0,0 +1,35 @@ +--- +disqus_identifier: 'https://docs.gitlab.com/ee/workflow/workflow.html' +--- + +# Feature branch workflow + +1. Clone project: + + ```bash + git clone git@example.com:project-name.git + ``` + +1. Create branch with your feature: + + ```bash + git checkout -b $feature_name + ``` + +1. Write code. Commit changes: + + ```bash + git commit -am "My feature is ready" + ``` + +1. Push your branch to GitLab: + + ```bash + git push origin $feature_name + ``` + +1. Review your code on commits page. + +1. Create a merge request. + +1. Your team lead will review the code & merge it to the main branch. |