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

updates

Browse source
This commit is contained in:
Julie Kirsch 2024-05-09 12:29:58 +02:00
parent b60dc63b18
commit f44901d76b
3 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
book/workflows/edit_book.md
View file

@ -89,10 +89,8 @@ You can edit it and commit the changes in the same manner as with markdown (.md)
````````
````````{tab-item} ... user type 4 ...
**... for ...**
```````{tab-set}
``````{tab-item} ... a brand new version (branch)...
``````{tab-item} ... for a brand new version (branch)...
**... by (1) making changes on a single or multiple file(s) <br>
(2) selecting changes to be added to the Git-timeline (staging) <br>
@ -159,7 +157,7 @@ Alternatively, you can also click on `Push origin` in the top bar.
`````
``````
``````{tab-item} ... an existing version (branch)...
``````{tab-item} ... for an existing version (branch)...
**... by (1) regularly obtaining updates from colleagues from GitLab/GitHub (pulling), <br>
(2) solving potential incompatible changes (merging conflicts), <br>
@ -281,7 +279,7 @@ Alternatively, you can also click on `Push origin` in the top bar.
````````{tab-item} ... User type 5 ...
```````{tab-set}
``````{tab-item} ... brand new version (branch)
``````{tab-item} ... for brand new version (branch)
**... by (1) making changes on a single or multiple file(s) <br>
(2) checking changes locally, <br>
@ -393,7 +391,7 @@ Python stuff?
`````
``````
``````{tab-item} ... existing version (branch)
``````{tab-item} ... for an existing version (branch)
**... by (1) regularly obtaining updates from colleagues from GitLab/GitHub (pulling), <br>
(2) solving potential incompatible changes (merging conflicts), <br>