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

Back again with some fixed

Browse source
This commit is contained in:
Tom van Woudenberg 2024-04-12 08:11:50 +02:00
parent b107b47d06
commit ca7988f940
8 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
book/workflows/collaboration.md
View file

@ -43,7 +43,7 @@ The steps involved are as follows:
- Add changes to Git-timeline locally (committing)
- Add changes to GitHub/GitLab (pushing)
````
````{tab-item} Brand new version (branch)
````{tab-item} Existing version (branch)
- Eventually solve conflicts with combining versions (merge conflicts, emerges after pulling)
- Add or make changes to file(s)
- Select files ready to be added to Git-timeline (staging)
@ -61,7 +61,7 @@ The steps involved are as follows:
- Add changes to Git-timeline locally (committing)
- Add changes to GitHub/GitLab (pushing)
````
````{tab-item} Brand new version (branch)
````{tab-item} Existing version (branch)
- Eventually solve conflicts with combining versions (merge conflicts, emerges after pulling)
- Add or make changes to file(s)
- Check changes in book locally