Refactor the forking process and add new images
[ci skip]
This commit is contained in:
parent
af52158ff8
commit
b6662c2a89
6 changed files with 28 additions and 13 deletions
Binary file not shown.
Before Width: | Height: | Size: 67 KiB |
Binary file not shown.
Before Width: | Height: | Size: 96 KiB |
|
@ -8,30 +8,45 @@ document more information about using branches to work together.
|
|||
|
||||
## Creating a fork
|
||||
|
||||
In order to create a fork of a project, all you need to do is click on
|
||||
the fork button located on the top right side of the screen, close to
|
||||
the project's URL and right next to the stars button.
|
||||
Forking a project is in most cases a two-step process.
|
||||
|
||||
![Fork button](forking/fork_button.png)
|
||||
|
||||
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.
|
||||
1. Click on the fork button located in the middle of the page or a project's
|
||||
home page right next to the stars button.
|
||||
|
||||
![Groups view](forking/groups.png)
|
||||
![Fork button](img/forking_workflow_fork_button.png)
|
||||
|
||||
---
|
||||
|
||||
1. 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.
|
||||
|
||||
![Choose namespace](img/forking_workflow_choose_namespace.png)
|
||||
|
||||
---
|
||||
|
||||
**Note:**
|
||||
If the namespace you chose to fork the project to has another project with
|
||||
the same path name, you will be presented with a warning that the forking
|
||||
could not be completed. Try to resolve the error and repeat the forking
|
||||
process.
|
||||
|
||||
![Path taken error](img/forking_workflow_path_taken_error.png)
|
||||
|
||||
---
|
||||
|
||||
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.
|
||||
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 project's main branch as
|
||||
the source and the original project's main branch as the destination and
|
||||
create the merge request.
|
||||
create the [merge request](merge_requests.md).
|
||||
|
||||
![Selecting branches](forking/branch_select.png)
|
||||
|
||||
|
|
BIN
doc/workflow/img/forking_workflow_choose_namespace.png
Normal file
BIN
doc/workflow/img/forking_workflow_choose_namespace.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 69 KiB |
BIN
doc/workflow/img/forking_workflow_fork_button.png
Normal file
BIN
doc/workflow/img/forking_workflow_fork_button.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 26 KiB |
BIN
doc/workflow/img/forking_workflow_path_taken_error.png
Normal file
BIN
doc/workflow/img/forking_workflow_path_taken_error.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 22 KiB |
Loading…
Reference in a new issue