Commit b6662c2a authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Refactor the forking process and add new images

[ci skip]
parent af52158f
...@@ -8,30 +8,45 @@ document more information about using branches to work together. ...@@ -8,30 +8,45 @@ document more information about using branches to work together.
## Creating a fork ## Creating a fork
In order to create a fork of a project, all you need to do is click on Forking a project is in most cases a two-step process.
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.
![Fork button](forking/fork_button.png)
Once you do that you'll be presented with a screen where you can choose 1. Click on the fork button located in the middle of the page or a project's
the namespace to fork to. Only namespaces (groups and your own home page right next to the stars button.
namespace) where you have write access to, will be shown. Click on the
namespace to create your fork there.
![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 After the forking is done, you can start working on the newly created
repository. There you will have full repository. There, you will have full [Owner](../permissions/permissions.md)
[Owner](../permissions/permissions.md) access, so you can set it up as access, so you can set it up as you please.
you please.
## Merging upstream ## Merging upstream
Once you are ready to send your code back to the main project, you need 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 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 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) ![Selecting branches](forking/branch_select.png)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment