admin2/manual_teachbooks
1
0
Fork 0
mirror of https://github.com/TeachBooks/manual.git synced 2026-11-12 22:35:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix image URL

Browse source
This commit is contained in:
Tom van Woudenberg 2024-05-27 14:11:49 +02:00
parent 8e0688f5e4
commit 77d68ac1fe
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
book/workflows/merge_request.md
View file

@ -51,7 +51,7 @@ In case you have cloned the repositery you can also resolve the conflicts locall
6. On the page of our merge request ({numref}`gitlab-finished-merge-request`), we're greeted with some more information. On top, you can read the description we just provided when creating the merge request. We can also see an "Approve" button, which you may or may not see, depending on your repository rights. Next, we can see a green checkmark, with a "Merge" button. This is good news: our changes do not conflict with existing files on the `main` branch, and we can merge our changes directly by clicking the button (if applicable: only after somebody else approved the request).
```{figure} ../images/gitlab-finished-merge-request.png
```{figure} ../../images/gitlab-finished-merge-request.png
:name: gitlab-finished-merge-request
The finished merge request.