summaryrefslogtreecommitdiff
path: root/doc/user/project/repository/forking_workflow.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-20 06:09:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-20 06:09:28 +0000
commit7734690def0c885f9f79567185c3dc5df353f9a0 (patch)
tree5d58f2aca429cd75392a162cfde8235ca23c863e /doc/user/project/repository/forking_workflow.md
parent0cc59b16497bef99058348ccb856811eca6e3081 (diff)
downloadgitlab-ce-7734690def0c885f9f79567185c3dc5df353f9a0.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/repository/forking_workflow.md')
-rw-r--r--doc/user/project/repository/forking_workflow.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/project/repository/forking_workflow.md b/doc/user/project/repository/forking_workflow.md
index a17e788d3a4..99ef5188bbd 100644
--- a/doc/user/project/repository/forking_workflow.md
+++ b/doc/user/project/repository/forking_workflow.md
@@ -50,7 +50,7 @@ Without mirroring, to work locally you'll have to use `git pull` to update your
with the upstream project, then push the changes back to your fork to update it.
CAUTION: **Caution:**
-With mirroring, before approving a merge request, you'll likely be asked to sync; hence automating it is recommend.
+With mirroring, before approving a merge request, you'll likely be asked to sync; hence automating it is recommended.
Read more about [How to keep your fork up to date with its origin](https://about.gitlab.com/blog/2016/12/01/how-to-keep-your-fork-up-to-date-with-its-origin/).
@@ -61,7 +61,7 @@ When you are ready to send your code back to the upstream project,
choose your forked project's branch. For **Target branch**, choose the original project's branch.
NOTE: **Note:**
-When creating a merge request, if the forked project's visibility is more restrictive than the parent project (for example the fork is private, parent is public), the target branch will default to the forked project's default branch. This prevents potentially exposing private code of the forked project.
+When creating a merge request, if the forked project's visibility is more restrictive than the parent project (for example the fork is private, the parent is public), the target branch will default to the forked project's default branch. This prevents potentially exposing the private code of the forked project.
![Selecting branches](img/forking_workflow_branch_select.png)