kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Implemented changes suggested by Job.

Browse source
This commit is contained in:
Patricio Cano 2015-04-07 19:27:04 -05:00
parent 09dbe452e3
commit a332e7bd02
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
doc/workflow/forking_workflow.md
View file

@ -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) ![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 Once you do that you'll be presented with a screen where you can choose the namespace to fork to. Only namespaces
will contain the groups you have write access to. Choose one of the groups and the project will be added there. (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) ![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, After the forking is done, you can start working on the newly created repository. There you will have full
so you can set it up as you please. [Owner](../permissions/permissions.md) access, so you can set it up as you please.
## Merging upstream ## 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. 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) ![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 You can then assign the merge request to someone to have them review your changes. Upon pressing the 'Accept Merge Request'
be added to the main project, if maintainer chooses to do so. button, your changes will be added to the repository and branch you're merging into.
![New merge request](forking/merge_request.png) ![New merge request](forking/merge_request.png)