Skip to content
Snippets Groups Projects
Commit bbe55a4d authored by Kaan Cimir's avatar Kaan Cimir
Browse files

webide card fix

parent a59e4222
No related branches found
No related tags found
No related merge requests found
external/contribute/web-ide/img/img10_v2.png

38.8 KiB

external/contribute/web-ide/img/img4_v2.png

535 KiB

external/contribute/web-ide/img/img6_v2.png

16.6 KiB

external/contribute/web-ide/img/img7_v2.png

410 KiB

external/contribute/web-ide/img/img8_v2.png

24.6 KiB

......@@ -40,7 +40,7 @@ You can now open the web editor (integrated development environment or IDE) by c
Now, you can make changes to the file you wish. As an example, we will make a change to the file `privacy_policy.md`. Select the file `privacy_policy.md` from the list on the left.
<img src="img/img4.png">
<img src="img/img4_v2.png">
Now, edit the file the way you want. For instance. we add a line with `test` in the first section:
......@@ -54,7 +54,7 @@ Now, edit the file the way you want. For instance. we add a line with `test` in
As already mentioned, a change has to be proposed, and will then be reviewed. The system used is through `merge requests`. Now, as you have edited the file, you can see that on the top left corner of the window, a blue circle with a number appeared on the `Source Control` button:
<img src="img/img6.png">
<img src="img/img6_v2.png">
The number of commits are indicated in the blue circle on the `Source Control` button.
......@@ -62,13 +62,13 @@ The number of commits are indicated in the blue circle on the `Source Control` b
When clicking on `Commit...`, the page changes to display the changes made:
<img src="img/img7.png">
<img src="img/img7_v2.png">
You can see that a green line has been added on the right column. The left column displays the original file (of the `develop` branch).
On the top left corner, you can see a form for committing the change. Here, you have to select `Commit to new branch` by clicking on the down arrow button. This is **important**.
<img src="img/img8.png">
<img src="img/img8_v2.png">
Once you click on the `Commit to new branch` button, type the name of your new branch and press `Enter` to accept or `Escape` to cancel.
......@@ -76,22 +76,19 @@ Once you click on the `Commit to new branch` button, type the name of your new b
You can also add a specific commit message to label the change properly. The name of the branch is generated automatically. You can, if you want, change it as well.
Then, select `Start a new request` when you are ready to start the submission process and hit the `Commit` button.
## Submitting your merge request
After creating the commit, the following pop-up window on the bottom right corner of your screen is going to indicate you that your changes have been commited. Click on the blue `Create MR` button to start your `Merge Request`.
<img src="img/img888.png">
You will be directed to the `New merge request` page. This page allows you to merge your changes with the target branch.
<img src="img/img12.png">
Please make sure that you see that you are proposing to merge your branch (version) into the `develop` branch. You can change your target branch by clicking on the `Change branches` button. This is shown at the top of the page:
<img src="img/img10.png">
<img src="img/img10_v2.png">
You can then fill our the merge request submission form and select, for instance, an `Assignee`.
......@@ -102,4 +99,3 @@ Under `Changes`, you can see the added line:
<img src="img/img11.png">
All that is left now is to submit the merge request by clicking on `Create merge request`. That is it.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment