diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-31 18:10:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-31 18:10:47 +0300 |
commit | 6f18a8d0b00eae84d262dff137fddd9639f3c52a (patch) | |
tree | f6297c5a843ee6096e996f58c768e80232e2b610 /doc/gitlab-basics | |
parent | c62dd5ae440db9ad4696000a863fbcb53fe83498 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/gitlab-basics')
-rw-r--r-- | doc/gitlab-basics/add-file.md | 2 | ||||
-rw-r--r-- | doc/gitlab-basics/feature_branch_workflow.md | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/doc/gitlab-basics/add-file.md b/doc/gitlab-basics/add-file.md index 95b8b59a48d..05731f93605 100644 --- a/doc/gitlab-basics/add-file.md +++ b/doc/gitlab-basics/add-file.md @@ -37,7 +37,7 @@ You can also [switch to an existing branch](start-using-git.md#switch-to-a-branc if you have one already. Using your standard tool for copying files (for example, Finder in macOS, or File Explorer -on Windows), put the file into a directory within the GitLab project. +on Windows), put the file into a directory in the GitLab project. Check if your file is actually present in the directory (if you're on Windows, use `dir` instead): diff --git a/doc/gitlab-basics/feature_branch_workflow.md b/doc/gitlab-basics/feature_branch_workflow.md index de051c67bc2..06d88cf14f6 100644 --- a/doc/gitlab-basics/feature_branch_workflow.md +++ b/doc/gitlab-basics/feature_branch_workflow.md @@ -32,7 +32,5 @@ disqus_identifier: 'https://docs.gitlab.com/ee/workflow/workflow.html' ``` 1. Review your code on commits page. - 1. Create a merge request. - 1. Your team lead reviews the code and merges it to the main branch. |