diff options
| author | Igor Frenkel <ifrenkel@gitlab.com> | 2019-10-28 11:30:32 -0400 |
|---|---|---|
| committer | Igor Frenkel <ifrenkel@gitlab.com> | 2019-10-28 11:30:32 -0400 |
| commit | 77b8ae642053bb9349add94f9406cc73265ce92b (patch) | |
| tree | 30e316b7e7e33cc1414f8f0fcb60b39a88163d80 /doc/gitlab-basics/README.md | |
| parent | 556f83033fed763caaa6b233ca6787aecd739187 (diff) | |
| parent | a77db6bc47d8cdd9edae2ec22f640821d0794404 (diff) | |
| download | gitlab-ce-11711-add-dep-scanner-var.tar.gz | |
Merge branch 'master' into 11711-add-dep-scanner-var11711-add-dep-scanner-var
Diffstat (limited to 'doc/gitlab-basics/README.md')
| -rw-r--r-- | doc/gitlab-basics/README.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/gitlab-basics/README.md b/doc/gitlab-basics/README.md index fc3d36910f2..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), @@ -30,7 +31,7 @@ The following are guides to basic GitLab functionality: - [Create a merge request](add-merge-request.md), to request changes made in a branch be merged into a project's repository. - See how these features come together in the [GitLab Flow introduction video](https://youtu.be/InKNIvky2KE) - and [GitLab Flow page](../workflow/gitlab_flow.md). + and [GitLab Flow page](../topics/gitlab_flow.md). ## Working with Git from the command line |