Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatricio Cano <patricio@gitlab.com>2015-04-08 03:27:04 +0300
committerPatricio Cano <patricio@gitlab.com>2015-04-08 03:27:04 +0300
commita332e7bd027d8d7f7f76f85d02c1594a4b5eb9c9 (patch)
treeb0bfd56101e781cb48205f47bd1d52654c1afc68 /doc/workflow/forking_workflow.md
parent09dbe452e3a57ab6ec68b0af76b32502cbeec00e (diff)
Implemented changes suggested by Job.
Diffstat (limited to 'doc/workflow/forking_workflow.md')
-rw-r--r--doc/workflow/forking_workflow.md15
1 files changed, 8 insertions, 7 deletions
diff --git a/doc/workflow/forking_workflow.md b/doc/workflow/forking_workflow.md
index 2c680a4c124..16a17290cb0 100644
--- a/doc/workflow/forking_workflow.md
+++ b/doc/workflow/forking_workflow.md
@@ -12,23 +12,24 @@ of the screen, close to the project's URL and right next to the stars button.
![Fork button](forking/fork_button.png)
-Once you do that you will see a screen where you can choose the namespace, to where you want to add the fork. This page
-will contain the groups you have write access to. Choose one of the groups and the project will be added there.
+Once you do that you'll be presented with a screen where you can choose the namespace to fork to. Only namespaces
+(groups and your own namespace) where you have write access to, will be shown. Click on the namespace to create your
+fork there.
![Groups view](forking/groups.png)
-After the forking is done, you can start working on the newly created repository. There you will have full Owner access,
-so you can set it up as you please.
+After the forking is done, you can start working on the newly created repository. There you will have full
+[Owner](../permissions/permissions.md) access, so you can set it up as you please.
## Merging upstream
-Once you are ready to send your code back to the main project, you need to create a Merge request. Choose your forked
+Once you are ready to send your code back to the main project, you need to create a merge request. Choose your forked
project's main branch as the source and the original project's main branch as the destination and create the merge request.
![Selecting branches](forking/branch_select.png)
-You can then assign the Merge Request to someone so they can review your changes. After they have reviewed them, the will
-be added to the main project, if maintainer chooses to do so.
+You can then assign the merge request to someone to have them review your changes. Upon pressing the 'Accept Merge Request'
+button, your changes will be added to the repository and branch you're merging into.
![New merge request](forking/merge_request.png)