From 327d09661d9b795981218eb2eccc526816950ecd Mon Sep 17 00:00:00 2001 From: Julie Kirsch Date: Sat, 26 Oct 2024 21:58:13 +0200 Subject: [PATCH 01/10] update user type 3 --- book/installation-and-setup/user_types.md | 3 +- book/workflows/edit_book.md | 39 ++++++++++++++-------- book/workflows/figures/Online_VS0.PNG | Bin 0 -> 12945 bytes 3 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 book/workflows/figures/Online_VS0.PNG diff --git a/book/installation-and-setup/user_types.md b/book/installation-and-setup/user_types.md index 9f99f01..df278be 100644 --- a/book/installation-and-setup/user_types.md +++ b/book/installation-and-setup/user_types.md @@ -17,8 +17,9 @@ Different types of users will interact with the website or the Jupyter Books dif 5. **Colleague making text and code (especially Python) adjustments to multiple files at the same time locally**.
Example Image
This user has more knowledge in GitLab/GitHub than the previous user and can basically take care of branching and merging by themselves. They know how to work with software for editing .md and .ipynb files. They can use the draft book online to view their changed in the book, or build the book locally. +
```{Note} -At this point, you might already be trying to see which user type fits you the best. We are aware that the lines between user types can be a bit blurry, especially between type 3, 4 and 5. If case you're (1) a user type 3 and want to dabble in git or (2) a user type 4/5 and want to make some quick edits with only a few clicks, then you might consider using a more advanced online editor in GitHub (GitHub Dev) as explained [further on in Collaborative book-editing - Edit - User type 3 - GitHub](../workflows/edit_book.md). +At this point, you might already be trying to see which user type fits you the best. We are aware that the lines between user types can be a bit blurry, especially between type 3, 4 and 5. In case you're (1) a user type 3 and want to dabble in git or (2) a user type 4/5 and want to make some quick edits with only a few clicks, then you might consider using a more advanced online editor in GitHub (GitHub Dev) as explained further on in [Collaborative book-editing > Edit](../workflows/edit_book.md) > User type 3 > GitHub > Using VS Code in your browser. ``` \ No newline at end of file diff --git a/book/workflows/edit_book.md b/book/workflows/edit_book.md index 904c1ea..eda2308 100644 --- a/book/workflows/edit_book.md +++ b/book/workflows/edit_book.md @@ -4,7 +4,7 @@ Suppose we are writing a new chapter, or are updating an existing chapter for ou **Edit files as ...** `````````{tab-set} -````````{tab-item} ... user type 3 ... +````````{tab-item} ... user type 3 ... **... by directly adding changes on a single file to the Git-timeline (committing) in ...** @@ -47,9 +47,12 @@ In GitLab, you can directly make changes in the files on the remote repository. You can edit it and commit the changes in the same manner as with markdown (.md) files. `````` -``````{tab-item} ... GitHub +``````{tab-item} ... GitHub -How to make an edit and make a commit is demonstrated in the figure below, all steps are elaborated on in the following step-by-step tutorial. +`````{tab-set} +````{tab-item} ... using 'Edit in place' + +How to make an edit and make a commit is demonstrated in the gif below. Don't worry if the steps are too fast, all steps are elaborated on in the following step-by-step tutorial. ```{figure} figures/user3-collaboration.gif --- @@ -74,9 +77,6 @@ In GitHub, you can directly make changes in the files on the remote repository. Example Image -`````{tab-set} -````{tab-item} ... using 'Edit in place' - 4. In case you want to make changes to an existing file, navigate to the file in your remote repository. Then click the downward pointing arrow on the very left in the top bar. Select the option `Edit in place`.
@@ -100,11 +100,23 @@ You can edit it and commit the changes in the same manner as with markdown (.md) ```` ````{tab-item} ... using 'VS Code in your browser' -Using this feature, you can open VS Code in your browser and edit the files in your repository. By doing this, you completely by-pass the need to open (and install) VS Code and GitHub Desktop on your laptop making it the optimal way to quickly fix something. +Using this feature, you can open VS Code in your browser and edit the files in your repository. By doing this, you completely by-pass the need to open (and install) VS Code and GitHub Desktop on your laptop making it the optimal way to quickly fix something. You can make changes to the files already in the repository but you can also upload new files! -1. Navigate to your main page (`code`) of your repository in GitHub -2. Press the dot key on your keyboard `.` This will open VS Code -3. Navigate to a file and make some changes +1. Navigate to the repository you want to work in and make sure you're in the correct branch +2. Navigate to your main page (`code`) of your repository in GitHub +3. Press the dot key on your keyboard `.` This will open VS Code + +4. In case you want to add a new file, navigate to the explorer file (the page icon) and click on the `New File` icon. This will create a new file in the folder that you are in. give it the right extension! + +```{figure} ./figures/Online_VS0.PNG +:name: New File +:width: 60% +:align: center + +New File +``` + +5. In case you want to make changes to an existing file, navigate to a file and make some changes ```{figure} ./figures/Online_VS1.PNG :name: VS Code in Browser @@ -115,8 +127,8 @@ VS Code in Browser ``` In the bottom left you can see the branch you are working in. -4. This feature requires you to use git in VS Code. You can do that in the Source Control tab in the activity bar on the left side of the window (it looks like a branching icon). Write your commit message and click on commit & push. -5. Now let's see the result. Go back to your GitHub repo. In the top bar, go to actions. +6. Once all the changes are made it's time to commit and push. GitHub Dev requires you to use git in VS Code. You can do that in the Source Control tab in the activity bar on the left side of the window (it looks like a branching icon). Write your commit message and click on commit & push. +7. Now let's see the result. Go back to your GitHub repo. In the top bar, go to actions. ```{figure} ./figures/Online_VS2.PNG :name: GitHub Actions @@ -138,7 +150,6 @@ Click on the link and admire your changes:) ```` ````` - `````` ``````` ```````` @@ -656,4 +667,4 @@ Alternatively, you can also click on `Push origin` in the top bar. `````` ``````` ```````` -````````` \ No newline at end of file +````````` diff --git a/book/workflows/figures/Online_VS0.PNG b/book/workflows/figures/Online_VS0.PNG new file mode 100644 index 0000000000000000000000000000000000000000..6c3fc611c13ff2f70bdf9e4f81c603503653d63e GIT binary patch literal 12945 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 TMq Date: Mon, 28 Oct 2024 09:54:44 +0100 Subject: [PATCH 02/10] edits --- book/workflows/edit_book.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/workflows/edit_book.md b/book/workflows/edit_book.md index eda2308..b3bb50c 100644 --- a/book/workflows/edit_book.md +++ b/book/workflows/edit_book.md @@ -47,7 +47,7 @@ In GitLab, you can directly make changes in the files on the remote repository. You can edit it and commit the changes in the same manner as with markdown (.md) files. `````` -``````{tab-item} ... GitHub +``````{tab-item} ... GitHub... `````{tab-set} ````{tab-item} ... using 'Edit in place' @@ -110,7 +110,7 @@ Using this feature, you can open VS Code in your browser and edit the files in y ```{figure} ./figures/Online_VS0.PNG :name: New File -:width: 60% +:width: 50% :align: center New File From eaf56b09c6588b87de8a4d2b8776493b9683efc5 Mon Sep 17 00:00:00 2001 From: Julie Kirsch Date: Mon, 28 Oct 2024 11:14:47 +0100 Subject: [PATCH 03/10] user 4 and 5 --- book/workflows/edit_book.md | 100 ++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/book/workflows/edit_book.md b/book/workflows/edit_book.md index b3bb50c..871b400 100644 --- a/book/workflows/edit_book.md +++ b/book/workflows/edit_book.md @@ -344,6 +344,56 @@ Alternatively, you can also click on `Push origin` in the top bar. Example Image
+```` +````{tab-item} ... using 'VS Code in your browser' + +Using this feature, you can open VS Code in your browser and edit the files in your repository. This can be really useful for quick fixes when you dont want to launch GitHub Dekstop or VS Code. + +1. Navigate to the repository you want to work in and make sure you're in the correct branch. +2. Navigate to your main page (`code`) of your repository in GitHub. +3. Press the dot key on your keyboard `.` This will open VS Code. +4. In case you want to add a new file, navigate to the explorer file (the page icon) and click on the `New File` icon. This will create a new file in the folder that you are in. Give it the right extension! + +```{figure} ./figures/Online_VS0.PNG +:name: New File +:width: 50% +:align: center + +New File +``` + +5. In case you want to make changes to an existing file, navigate to a file and make some changes. + +```{figure} ./figures/Online_VS1.PNG +:name: VS Code in Browser +:width: 70% +:align: center + +VS Code in Browser +``` +In the bottom left you can see the branch you are working in. + +6. Once all the changes are made it's time to commit and push. GitHub Dev requires you to use git in VS Code. You can do that in the Source Control tab in the activity bar on the left side of the window (it looks like a branching icon). Write your commit message and click on commit & push. +7. Now let's see the result. Go back to your GitHub repo. In the top bar, go to actions. + +```{figure} ./figures/Online_VS2.PNG +:name: GitHub Actions +:width: 70% +:align: center + +GitHub Actions +``` +You will see the latest commit you just did (in this case text). After the pipeline has run, the yellow icon will turn green. Click on the commit and scroll until you see the title Deployed Branches. + +```{figure} ./figures/Online_VS3.PNG +:name: Deployed Branches +:width: 60% +:align: center + +Deployed Branches +``` +Click on the link and admire your changes:) + ```` ````` `````` @@ -662,6 +712,56 @@ Alternatively, you can also click on `Push origin` in the top bar.
Example Image
+```` +````{tab-item} ... using 'VS Code in your browser' + +Using this feature, you can open VS Code in your browser and edit the files in your repository. This can be really useful for quick fixes when you dont want to launch GitHub Dekstop or VS Code. + +1. Navigate to the repository you want to work in and make sure you're in the correct branch. +2. Navigate to your main page (`code`) of your repository in GitHub. +3. Press the dot key on your keyboard `.` This will open VS Code. +4. In case you want to add a new file, navigate to the explorer file (the page icon) and click on the `New File` icon. This will create a new file in the folder that you are in. Give it the right extension! + +```{figure} ./figures/Online_VS0.PNG +:name: New File +:width: 50% +:align: center + +New File +``` + +5. In case you want to make changes to an existing file, navigate to a file and make some changes. + +```{figure} ./figures/Online_VS1.PNG +:name: VS Code in Browser +:width: 70% +:align: center + +VS Code in Browser +``` +In the bottom left you can see the branch you are working in. + +6. Once all the changes are made it's time to commit and push. GitHub Dev requires you to use git in VS Code. You can do that in the Source Control tab in the activity bar on the left side of the window (it looks like a branching icon). Write your commit message and click on commit & push. +7. Now let's see the result. Go back to your GitHub repo. In the top bar, go to actions. + +```{figure} ./figures/Online_VS2.PNG +:name: GitHub Actions +:width: 70% +:align: center + +GitHub Actions +``` +You will see the latest commit you just did (in this case text). After the pipeline has run, the yellow icon will turn green. Click on the commit and scroll until you see the title Deployed Branches. + +```{figure} ./figures/Online_VS3.PNG +:name: Deployed Branches +:width: 60% +:align: center + +Deployed Branches +``` +Click on the link and admire your changes:) + ```` ````` `````` From cdd9c8c82ff683d18253d0f009fc4a94d06aeb0d Mon Sep 17 00:00:00 2001 From: Julie Kirsch Date: Mon, 28 Oct 2024 11:22:43 +0100 Subject: [PATCH 04/10] edit --- book/workflows/edit_book.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/workflows/edit_book.md b/book/workflows/edit_book.md index 871b400..152ac9b 100644 --- a/book/workflows/edit_book.md +++ b/book/workflows/edit_book.md @@ -347,7 +347,7 @@ Alternatively, you can also click on `Push origin` in the top bar. ```` ````{tab-item} ... using 'VS Code in your browser' -Using this feature, you can open VS Code in your browser and edit the files in your repository. This can be really useful for quick fixes when you dont want to launch GitHub Dekstop or VS Code. +Using this feature, you can open VS Code in your browser and edit the files in your repository. This can be really useful for **quick fixes** when you dont want to launch GitHub Dekstop or VS Code. However, we would recommend to limit the use of this feature to quick changes as the other workflows allow for more complex tasks. 1. Navigate to the repository you want to work in and make sure you're in the correct branch. 2. Navigate to your main page (`code`) of your repository in GitHub. @@ -715,7 +715,7 @@ Alternatively, you can also click on `Push origin` in the top bar. ```` ````{tab-item} ... using 'VS Code in your browser' -Using this feature, you can open VS Code in your browser and edit the files in your repository. This can be really useful for quick fixes when you dont want to launch GitHub Dekstop or VS Code. +Using this feature, you can open VS Code in your browser and edit the files in your repository. This can be really useful for **quick fixes** when you dont want to launch GitHub Dekstop or VS Code. However, we would recommend to limit the use of this feature to quick changes as the other workflows allow for more complex tasks. 1. Navigate to the repository you want to work in and make sure you're in the correct branch. 2. Navigate to your main page (`code`) of your repository in GitHub. From c71e7b4c1381c730aca1e4468c6ef0125ca55731 Mon Sep 17 00:00:00 2001 From: Julie Kirsch Date: Mon, 4 Nov 2024 12:24:22 +0100 Subject: [PATCH 05/10] does it work now --- book/workflows/edit_book.md | 1 + 1 file changed, 1 insertion(+) diff --git a/book/workflows/edit_book.md b/book/workflows/edit_book.md index 152ac9b..cb320c6 100644 --- a/book/workflows/edit_book.md +++ b/book/workflows/edit_book.md @@ -762,6 +762,7 @@ Deployed Branches ``` Click on the link and admire your changes:) + ```` ````` `````` From b122d776d3d38b8f793e4ba6567b84fdda5be70c Mon Sep 17 00:00:00 2001 From: Julie Kirsch Date: Mon, 4 Nov 2024 20:53:28 +0100 Subject: [PATCH 06/10] fix errors 1 --- book/workflows/edit_book.md | 188 ++++++++++++----------------------- book/workflows/github_dev.md | 44 ++++++++ 2 files changed, 107 insertions(+), 125 deletions(-) create mode 100644 book/workflows/github_dev.md diff --git a/book/workflows/edit_book.md b/book/workflows/edit_book.md index e41a26a..105f091 100644 --- a/book/workflows/edit_book.md +++ b/book/workflows/edit_book.md @@ -17,42 +17,52 @@ In GitLab, you can directly make changes in the files on the remote repository. 2. Create a new file by clicking on the plus button in the top bar. You can either create an entirely new file by clicking `New File` or if you already have created a file you can upload it by clicking `Upload File`. -
- Example Image -
+```{figure} figures/User3_NewFile.PNG +width: 60% +align: center + +Create new file +``` 3. In the new window, you can start typing your content. Give your file a name and make sure to use the markdown extension: `Chapter1.md`. Once you are done, commit the new file to the repository by clicking the blue button `Commit changes`. -
- Example Image -
+```{figure} figures/User3_NewFile2.PNG +align: center + +Edit new file +``` 4. In case you want to make changes to an existing file, navigate to the file in your remote repository. Then click the blue button called `Edit` and select the option `Edit single file`. -
- Example Image -
+```{figure} figures/User3_EditFile.PNG +align: center + +Web Editor +``` 5. Make your changes in the text editor and when you are ready, commit your changes to the remote repository by clicking on the blue `Commit changes` button. -
- Example Image -
+```{figure} figures/User3_NewFile2.PNG +align: center -6. In case you added a new file, you also need to include it table of contents of your book! The table of contents is specified in a file called `toc.yml` and it is already included in your repository if you used the teachbooks template. +Commit changes +``` -
- Example Image -
+6. In case you added a new file, you also need to include it table of contents of your book! The table of contents is specified in a file called `toc.yml` and it is already included in your repository if you used the teachbooks template. You can edit it and commit the changes in the same manner as you did with markdown `file.md` files. -You can edit it and commit the changes in the same manner as with markdown (.md) files. +```{figure} figures/User3_toc.PNG +align: center + +Table of contents (TOC) +``` `````` + ``````{tab-item} ... GitHub... `````{tab-set} ````{tab-item} ... using 'Edit in place' -How to make an edit and make a commit is demonstrated in the gif below. Don't worry if the steps are too fast, all steps are elaborated on in the following step-by-step tutorial. +How to make an edit and make a commit is demonstrated in the gif below.
Don't worry if the steps are too fast, all steps are elaborated on in the following step-by-step tutorial. ```{figure} figures/user3-collaboration.gif --- @@ -67,92 +77,63 @@ In GitHub, you can directly make changes in the files on the remote repository. 2. Create a new file by clicking on the button called `Add file` in the top bar. You can either create an entirely new file by clicking `Create new File` or if you already have created a file you can upload it by clicking `Upload files`. -
- Example Image -
+```{figure} figures/HubUser3_NewFile.PNG +width: 80% +align: center -3. In the new window, you can start typing your content. Give your file a name and make sure to use the markdown extension: `Chapter1.md`. Once you are done, commit the new file to the repository by clicking the green button `Commit changes`. +Create new file +``` -
- Example Image -
+3. In the new window, you can start typing your content. Give your file a name and make sure to use the markdown extension: `file_name.md`. Once you are done, commit the new file to the repository by clicking the green button `Commit changes`. + +```{figure} figures/HubUser3_NewFile2.PNG +width: 80% +align: center + +Edit new file +``` 4. In case you want to make changes to an existing file, navigate to the file in your remote repository. Then click the downward pointing arrow on the very left in the top bar. Select the option `Edit in place`. -
- Example Image -
+```{figure} figures/HubUser3_EditFile.PNG +width: 80% +align: center + +Edit in place +``` 5. Make your changes in the text editor and when you are ready, commit your changes to the remote repository by clicking on the green `Commit changes` button. -
- Example Image -
+```{figure} figures/HubUser3_EditFile2.PNG +width: 80% +align: center -6. In case you added a new file, you also need to include it table of contents of your book! The table of contents is specified in a file called `toc.yml` and it is already included in your repository if you used the teachbooks template. +Commit changes +``` -
- Example Image -
+6. In case you added a new file, you also need to include it table of contents of your book! The table of contents is specified in a file called `toc.yml` and it is already included in your repository if you used the teachbooks template. You can edit it and commit the changes in the same manner as with markdown `(file.md)` files. -You can edit it and commit the changes in the same manner as with markdown (.md) files. +```{figure} figures/HubUser3_toc.PNG +width: 80% +align: center +Table of contents +``` ```` + ````{tab-item} ... using 'VS Code in your browser' Using this feature, you can open VS Code in your browser and edit the files in your repository. By doing this, you completely by-pass the need to open (and install) VS Code and GitHub Desktop on your laptop making it the optimal way to quickly fix something. You can make changes to the files already in the repository but you can also upload new files! -1. Navigate to the repository you want to work in and make sure you're in the correct branch -2. Navigate to your main page (`code`) of your repository in GitHub -3. Press the dot key on your keyboard `.` This will open VS Code - -4. In case you want to add a new file, navigate to the explorer file (the page icon) and click on the `New File` icon. This will create a new file in the folder that you are in. give it the right extension! - -```{figure} ./figures/Online_VS0.PNG -:name: New File -:width: 50% -:align: center - -New File +```{include} github_dev.md ``` -5. In case you want to make changes to an existing file, navigate to a file and make some changes - -```{figure} ./figures/Online_VS1.PNG -:name: VS Code in Browser -:width: 70% -:align: center - -VS Code in Browser -``` -In the bottom left you can see the branch you are working in. - -6. Once all the changes are made it's time to commit and push. GitHub Dev requires you to use git in VS Code. You can do that in the Source Control tab in the activity bar on the left side of the window (it looks like a branching icon). Write your commit message and click on commit & push. -7. Now let's see the result. Go back to your GitHub repo. In the top bar, go to actions. - -```{figure} ./figures/Online_VS2.PNG -:name: GitHub Actions -:width: 70% -:align: center - -GitHub Actions -``` -You will see the latest commit you just did (in this case text). After the pipeline has run, the yellow icon will turn green. Click on the commit and scroll until you see the title Deployed Branches. - -```{figure} ./figures/Online_VS3.PNG -:name: Deployed Branches -:width: 60% -:align: center - -Deployed Branches -``` -Click on the link and admire your changes:) - ```` ````` `````` ``````` ```````` + ````````{tab-item} ... user type 4 ... ```````{tab-set} @@ -176,7 +157,7 @@ Demonstration, video available [here](https://youtu.be/bThimdDRXTc) 1. Make some changes to a file in for example VS Code and save them. -2. Select the files ready to be added to Git-timeline (staging) +2. Select the files ready to be added to Git-timeline (staging) For demonstration purposes, we have created a new Markdown file called `new-chapter.md`, which we want to add to the book. Since this is a new file, Git has no knowledge about its existence yet. I.e., the file is *untracked*. To add new files to our repository, we need to *stage* and *commit* them. To do this, open the Source Control menu in the left side bar. Our new file should appear in this menu: @@ -760,52 +741,9 @@ Alternatively, you can also click on `Push origin` in the top bar. Using this feature, you can open VS Code in your browser and edit the files in your repository. This can be really useful for **quick fixes** when you dont want to launch GitHub Dekstop or VS Code. However, we would recommend to limit the use of this feature to quick changes as the other workflows allow for more complex tasks. -1. Navigate to the repository you want to work in and make sure you're in the correct branch. -2. Navigate to your main page (`code`) of your repository in GitHub. -3. Press the dot key on your keyboard `.` This will open VS Code. -4. In case you want to add a new file, navigate to the explorer file (the page icon) and click on the `New File` icon. This will create a new file in the folder that you are in. Give it the right extension! - -```{figure} ./figures/Online_VS0.PNG -:name: New File -:width: 50% -:align: center - -New File +```{include} githu_dev.md ``` -5. In case you want to make changes to an existing file, navigate to a file and make some changes. - -```{figure} ./figures/Online_VS1.PNG -:name: VS Code in Browser -:width: 70% -:align: center - -VS Code in Browser -``` -In the bottom left you can see the branch you are working in. - -6. Once all the changes are made it's time to commit and push. GitHub Dev requires you to use git in VS Code. You can do that in the Source Control tab in the activity bar on the left side of the window (it looks like a branching icon). Write your commit message and click on commit & push. -7. Now let's see the result. Go back to your GitHub repo. In the top bar, go to actions. - -```{figure} ./figures/Online_VS2.PNG -:name: GitHub Actions -:width: 70% -:align: center - -GitHub Actions -``` -You will see the latest commit you just did (in this case text). After the pipeline has run, the yellow icon will turn green. Click on the commit and scroll until you see the title Deployed Branches. - -```{figure} ./figures/Online_VS3.PNG -:name: Deployed Branches -:width: 60% -:align: center - -Deployed Branches -``` -Click on the link and admire your changes:) - - ```` ````` `````` diff --git a/book/workflows/github_dev.md b/book/workflows/github_dev.md new file mode 100644 index 0000000..9c5b815 --- /dev/null +++ b/book/workflows/github_dev.md @@ -0,0 +1,44 @@ +1. Navigate to the repository you want to work in and make sure you're in the correct branch. +2. Navigate to your main page (`code`) of your repository in GitHub. +3. Press the dot key on your keyboard `.` This will open VS Code. +4. In case you want to add a new file, navigate to the explorer file (the page icon) and click on the `New File` icon. This will create a new file in the folder that you are in. Give it the right extension! + +```{figure} figures/Online_VS0.PNG +name: New File +width: 50% +align: center + +New File +``` + +5. In case you want to make changes to an existing file, navigate to a file and make some changes. + +```{figure} figures/Online_VS1.PNG +name: VS Code in Browser +width: 70% +align: center + +VS Code in Browser +``` +In the bottom left you can see the branch you are working in. + +6. Once all the changes are made it's time to commit and push. GitHub Dev requires you to use git in VS Code. You can do that in the Source Control tab in the activity bar on the left side of the window (it looks like a branching icon). Write your commit message and click on commit & push. +7. Now let's see the result. Go back to your GitHub repo. In the top bar, go to actions. + +```{figure} figures/Online_VS2.PNG +name: GitHub Actions +width: 70% +align: center + +GitHub Actions +``` +You will see the latest commit you just did (in this case text). After the pipeline has run, the yellow icon will turn green. Click on the commit and scroll until you see the title Deployed Branches. + +```{figure} figures/Online_VS3.PNG +name: Deployed Branches +width: 60% +align: center + +Deployed Branches +``` +Click on the link and admire your changes:) \ No newline at end of file From 0193f8c0499090fb2e515ba96553a84e65af2e4e Mon Sep 17 00:00:00 2001 From: Julie Kirsch Date: Mon, 4 Nov 2024 21:32:58 +0100 Subject: [PATCH 07/10] changes2 --- book/workflows/edit_book.md | 153 +++++++++---------------- book/workflows/user45_check_changes.md | 44 +++++++ 2 files changed, 101 insertions(+), 96 deletions(-) create mode 100644 book/workflows/user45_check_changes.md diff --git a/book/workflows/edit_book.md b/book/workflows/edit_book.md index 105f091..404fb72 100644 --- a/book/workflows/edit_book.md +++ b/book/workflows/edit_book.md @@ -154,22 +154,20 @@ How to make an edit and make a commit using VS Code is demonstrated in the figur name: user4_clone_edit_demo --- Demonstration, video available [here](https://youtu.be/bThimdDRXTc) +``` 1. Make some changes to a file in for example VS Code and save them. -2. Select the files ready to be added to Git-timeline (staging) - +2. Select the files ready to be added to Git-timeline (staging)
For demonstration purposes, we have created a new Markdown file called `new-chapter.md`, which we want to add to the book. Since this is a new file, Git has no knowledge about its existence yet. I.e., the file is *untracked*. To add new files to our repository, we need to *stage* and *commit* them. To do this, open the Source Control menu in the left side bar. Our new file should appear in this menu: ```{figure} ../images/git-new-file.png The new file appears in the Source Control menu. ``` - Notice that there is a green letter U placed besides the file, meaning that our file is untracked. To add a file to the *staging area*, click on the + that appears when you hover over the file. -3. Adding changes to the Git-timeline (committing) - +3. Adding changes to the Git-timeline (committing)
Next, in the field that says "Message", write a short description of the changes you have made. This message is what is called the *Commit Message*. After we've done this, the menu should now look something like this: ```{figure} ../images/git-file-added.png @@ -183,7 +181,7 @@ Now, we are ready to add the changes to the repository. This is done by *committ ```{figure} ../images/git-push.png After committing, click the 🔄 button to push our changes to the remote repository. - +``` ```` ````{tab-item} ... GitHub Desktop @@ -248,7 +246,7 @@ Choose one of the options to resolve the merge conflict. You now have updated yo 3. Make some further changes to a file in for example VS Code and save them. -4. Select the files ready to be added to Git-timeline (staging) +4. Select the files ready to be added to Git-timeline (staging) For demonstration purposes, we have created a new Markdown file called `new-chapter.md`, which we want to add to the book. Since this is a new file, Git has no knowledge about its existence yet. I.e., the file is *untracked*. To add new files to our repository, we need to *stage* and *commit* them. To do this, open the Source Control menu in the left side bar. Our new file should appear in this menu: @@ -330,51 +328,9 @@ Alternatively, you can also click on `Push origin` in the top bar. Using this feature, you can open VS Code in your browser and edit the files in your repository. This can be really useful for **quick fixes** when you dont want to launch GitHub Dekstop or VS Code. However, we would recommend to limit the use of this feature to quick changes as the other workflows allow for more complex tasks. -1. Navigate to the repository you want to work in and make sure you're in the correct branch. -2. Navigate to your main page (`code`) of your repository in GitHub. -3. Press the dot key on your keyboard `.` This will open VS Code. -4. In case you want to add a new file, navigate to the explorer file (the page icon) and click on the `New File` icon. This will create a new file in the folder that you are in. Give it the right extension! - -```{figure} ./figures/Online_VS0.PNG -:name: New File -:width: 50% -:align: center - -New File +```{include} githu_dev.md ``` -5. In case you want to make changes to an existing file, navigate to a file and make some changes. - -```{figure} ./figures/Online_VS1.PNG -:name: VS Code in Browser -:width: 70% -:align: center - -VS Code in Browser -``` -In the bottom left you can see the branch you are working in. - -6. Once all the changes are made it's time to commit and push. GitHub Dev requires you to use git in VS Code. You can do that in the Source Control tab in the activity bar on the left side of the window (it looks like a branching icon). Write your commit message and click on commit & push. -7. Now let's see the result. Go back to your GitHub repo. In the top bar, go to actions. - -```{figure} ./figures/Online_VS2.PNG -:name: GitHub Actions -:width: 70% -:align: center - -GitHub Actions -``` -You will see the latest commit you just did (in this case text). After the pipeline has run, the yellow icon will turn green. Click on the commit and scroll until you see the title Deployed Branches. - -```{figure} ./figures/Online_VS3.PNG -:name: Deployed Branches -:width: 60% -:align: center - -Deployed Branches -``` -Click on the link and admire your changes:) - ```` ````` `````` @@ -387,7 +343,7 @@ Click on the link and admire your changes:) ``````{tab-item} ... for brand new version (branch) **... by (a) making changes on a single or multiple file(s)
- (b) checking changes locally,
+ (b) checking changes locally
(c) selecting changes to be added to the Git-timeline (staging)
(d) adding changes to the Git-timeline (committing) and
(e) adding changes to GitLab/GitHub (pushing) with ...** @@ -406,37 +362,40 @@ Demonstration, video available [here](https://youtu.be/2ttjBevkEP8) 1. Make some changes to a file in for example VS Code and save them. -2. Once all the changes are made, it can be useful to check the changes locally on your device in order to see how it will look on the website. If all the required environments and packages are downloaded, checking changes locally is fairly easy! +2. Once all the changes are made, it can be useful to check the changes locally on your device.
+ + By doing that you can preview how it will look on the website. If all the required environments and packages are downloaded, checking changes locally is fairly easy. -Navigate to the terminal in VS code, located at the bottom of the window or by clicking on `Terminal` in the top bar. + Navigate to the terminal in VS code, located at the bottom of the window or by clicking on `Terminal` in the top bar. + You will firstly need to activate the right environment. Type the following command: -You will firstly need to activate the right environment. Type the following command: +``` +conda activate jupyter-book-env +``` -`conda activate jupyter-book-env` - -(or the environment in which you have installed the TeachBooks package) - -Then we can build the book locally. Make sure you are in the right repository in VS code and type the following command: + (or the environment in which you have installed the `teachbooks` package!) + + Then we can build the book locally. Make sure you are in the right repository in VS code and type the following command: ``` teachbooks build ``` -Alternatively: + Alternatively: ``` jupyter-book build --all ``` -Note: use `--all` for the jupyter-book whenever building a book to make sure the table of contents fully updates. Or alternatively, delete the old `_build` folder before building the new book. + Note: use `--all` for the jupyter-book whenever building a book to make sure the table of contents fully updates. Or alternatively, delete the old `_build` folder before building the new book. -Where book is the name of the folder containing all the files that make up your book. After `teachbooks` is done running you will get the following: + Where book is the name of the folder containing all the files that make up your book. After `teachbooks` is done running you will get the following: ```{figure} ../figures/buildbook.PNG Output ``` -Paste the last line into your browser to see the updated changes. + Paste the last line into your browser to see the updated changes. ```{Note} @@ -446,32 +405,32 @@ Sometimes there are problems building the book. It could be that the building re ``` -If your book includes interactive element a webserver is required to host the book. If you want to do this locally, you can make use of (the teachbooks package to start up a local webserver)[setup-local-server] + If your book includes interactive element a webserver is required to host the book. If you want to do this locally, you can make use of (the teachbooks package to start up a local webserver)[setup-local-server] 3. If you are satisfied with your changes, you can select the files ready to be added to Git-timeline (staging) -For demonstration purposes, we have created a new Markdown file called `new-chapter.md`, which we want to add to the book. Since this is a new file, Git has no knowledge about its existence yet. I.e., the file is *untracked*. To add new files to our repository, we need to *stage* and *commit* them. To do this, open the Source Control menu in the left side bar. Our new file should appear in this menu: + For demonstration purposes, we have created a new Markdown file called `new-chapter.md`, which we want to add to the book. Since this is a new file, Git has no knowledge about its existence yet. I.e., the file is *untracked*. To add new files to our repository, we need to *stage* and *commit* them. To do this, open the Source Control menu in the left side bar. Our new file should appear in this menu: ```{figure} ../images/git-new-file.png The new file appears in the Source Control menu. ``` -Notice that there is a green letter U placed besides the file, meaning that our file is untracked. To add a file to the *staging area*, click on the + that appears when you hover over the file. + Notice that there is a green letter U placed besides the file, meaning that our file is untracked. To add a file to the *staging area*, click on the + that appears when you hover over the file. 4. Adding changes to the Git-timeline (committing) -Next, in the field that says "Message", write a short description of the changes you have made. This message is what is called the *Commit Message*. After we've done this, the menu should now look something like this: + Next, in the field that says "Message", write a short description of the changes you have made. This message is what is called the *Commit Message*. After we've done this, the menu should now look something like this: ```{figure} ../images/git-file-added.png The new file has been staged, and we've written a Commit Message. ``` -Now, we are ready to add the changes to the repository. This is done by *committing* the staged changes. To do this, simply press the big, blue "Commit" button in the Source Control menu. + Now, we are ready to add the changes to the repository. This is done by *committing* the staged changes. To do this, simply press the big, blue "Commit" button in the Source Control menu. 5. Adding changes to GitLab/GitHub (pushing) -In the bottom left corner, next to the branch name, click the "Synchronize Changes" button (the one that looks like this: 🔄, highlighted in the image below) to push the changes to GitLab/GitHub. + In the bottom left corner, next to the branch name, click the "Synchronize Changes" button (the one that looks like this: 🔄, highlighted in the image below) to push the changes to GitLab/GitHub. ```{figure} ../images/git-push.png @@ -480,39 +439,42 @@ After committing, click the 🔄 button to push our changes to the remote reposi ````{tab-item} ... GitHub Desktop -1.. Make some changes to a file in for example VS Code and save them. +1. Make some changes to a file in for example VS Code and save them. -2. Once all the changes are made, it can be useful to check the changes locally on your device in order to see how it will look on the website. If all the required environments and packages are downloaded, checking changes locally is fairly easy! +2. Once all the changes are made, it can be useful to check the changes locally on your device.
+ + By doing that you can preview how it will look on the website. If all the required environments and packages are downloaded, checking changes locally is fairly easy. -Navigate to the terminal in VS code, located at the bottom of the window or by clicking on `Terminal` in the top bar. + Navigate to the terminal in VS code, located at the bottom of the window or by clicking on `Terminal` in the top bar. + You will firstly need to activate the right environment. Type the following command: -You will firstly need to activate the right environment. Type the following command: +``` +conda activate jupyter-book-env +``` -`conda activate jupyter-book-env` - -(or the environment in which you have installed the TeachBooks package) - -Then we can build the book locally. Make sure you are in the right repository in VS code and type the following command: + (or the environment in which you have installed the `teachbooks` package!) + + Then we can build the book locally. Make sure you are in the right repository in VS code and type the following command: ``` teachbooks build ``` -Alternatively: + Alternatively: ``` jupyter-book build --all ``` -Note: use `--all` for the jupyter-book whenever building a book to make sure the table of contents fully updates. Or alternatively, delete the old `_build` folder before building the new book. + Note: use `--all` for the jupyter-book whenever building a book to make sure the table of contents fully updates. Or alternatively, delete the old `_build` folder before building the new book. -Where book is the name of the folder containing all the files that make up your book. After `teachbooks` is done running you will get the following: + Where book is the name of the folder containing all the files that make up your book. After `teachbooks` is done running you will get the following: ```{figure} ../figures/buildbook.PNG Output ``` -Paste the last line into your browser to see the updated changes. + Paste the last line into your browser to see the updated changes. ```{Note} @@ -522,29 +484,28 @@ Sometimes there are problems building the book. It could be that the building re ``` -If your book includes interactive element a webserver is required to host the book. If you want to do this locally, you can make use of (the teachbooks package to start up a local webserver)[setup-local-server] + If your book includes interactive element a webserver is required to host the book. If you want to do this locally, you can make use of (the teachbooks package to start up a local webserver)[setup-local-server] 3. If you are satisfied with your changes, you can select the files ready to be added to Git-timeline (staging) -The staging GitHub Desktop assumes you want to stage all files. These files will show up on the left side bar when you open GitHub Desktop. You can unselect some of them (unstaging them) by clicking on the *check*. + The staging GitHub Desktop assumes you want to stage all files. These files will show up on the left side bar when you open GitHub Desktop. You can unselect some of them (unstaging them) by clicking on the *check*. -
- Example Image -
+```{figure} figures/Stage_GitHubDekstop.PNG +width: 50% -4. Add changes to Git-timeline locally (committing). In the field that says `Summary(Required)`, write a short description of the changes you have made. This message is what is called the *Commit Message*. After we've done this, click the blue button `Commit to repository`. +Staging +``` -5. Now we need to add changes to GitHub/GitLab. This is called pushing to the local repository. After committing, the following screen will pop up. Click on `Push Origin`. +4. Add changes to Git-timeline locally (committing). In the field that says `Summary (Required)`, write a short description of the changes you have made. This message is what is called the *Commit Message*. After we've done this, click the blue button `Commit to repository`. -
- Example Image -
+5. Now we need to add changes to GitHub/GitLab. This is called pushing to the local repository. After committing, click on `Push Origin` in the top bar. -Alternatively, you can also click on `Push origin` in the top bar. +```{figure} figures/Push_GitHubDekstop.PNG +width: 100% + +Push origin +``` -
- Example Image -
```` ````` diff --git a/book/workflows/user45_check_changes.md b/book/workflows/user45_check_changes.md new file mode 100644 index 0000000..c4d3f0f --- /dev/null +++ b/book/workflows/user45_check_changes.md @@ -0,0 +1,44 @@ + Once all the changes are made, it can be useful to check the changes locally on your device. + + By doing that you can preview how it will look on the website. If all the required environments and packages are downloaded, checking changes locally is fairly easy. + + Navigate to the terminal in VS code, located at the bottom of the window or by clicking on `Terminal` in the top bar. + You will firstly need to activate the right environment. Type the following command: + +``` +conda activate jupyter-book-env +``` + + (or the environment in which you have installed the `teachbooks` package!) + + Then we can build the book locally. Make sure you are in the right repository in VS code and type the following command: + +``` +teachbooks build +``` + + Alternatively: + +``` +jupyter-book build --all +``` + + Note: use `--all` for the jupyter-book whenever building a book to make sure the table of contents fully updates. Or alternatively, delete the old `_build` folder before building the new book. + + Where book is the name of the folder containing all the files that make up your book. After `teachbooks` is done running you will get the following: + +```{figure} ../figures/buildbook.PNG + +Output +``` + Paste the last line into your browser to see the updated changes. + +```{Note} + +Sometimes there are problems building the book. It could be that the building requires extensions that are not present in your environment. To prevent issues, make sure to update your environment by routinely updating your packages. You can do this by executing the following line in your environment in the command line. + +`pip install -r requirements.txt --upgrade` + +``` + + If your book includes interactive element a webserver is required to host the book. If you want to do this locally, you can make use of (the teachbooks package to start up a local webserver)[setup-local-server] \ No newline at end of file From 82606d0c5b5c21148effab759a98b4a6f271bead Mon Sep 17 00:00:00 2001 From: Julie Kirsch Date: Mon, 4 Nov 2024 21:37:14 +0100 Subject: [PATCH 08/10] changes3 --- book/workflows/edit_book.md | 12 +++++------- book/workflows/figures/Push_GitHubDesktop.PNG | Bin 10375 -> 12858 bytes 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/book/workflows/edit_book.md b/book/workflows/edit_book.md index 404fb72..a53b5b4 100644 --- a/book/workflows/edit_book.md +++ b/book/workflows/edit_book.md @@ -328,7 +328,7 @@ Alternatively, you can also click on `Push origin` in the top bar. Using this feature, you can open VS Code in your browser and edit the files in your repository. This can be really useful for **quick fixes** when you dont want to launch GitHub Dekstop or VS Code. However, we would recommend to limit the use of this feature to quick changes as the other workflows allow for more complex tasks. -```{include} githu_dev.md +```{include} github_dev.md ``` ```` @@ -391,7 +391,7 @@ jupyter-book build --all Where book is the name of the folder containing all the files that make up your book. After `teachbooks` is done running you will get the following: -```{figure} ../figures/buildbook.PNG +```{figure} figures/buildbook.PNG Output ``` @@ -470,7 +470,7 @@ jupyter-book build --all Where book is the name of the folder containing all the files that make up your book. After `teachbooks` is done running you will get the following: -```{figure} ../figures/buildbook.PNG +```{figure} figures/buildbook.PNG Output ``` @@ -505,8 +505,6 @@ width: 100% Push origin ``` - - ```` ````` `````` @@ -574,7 +572,7 @@ Note: use `--all` for the jupyter-book whenever building a book to make sure the Where book is the name of the folder containing all the files that make up your book. After `teachbooks` is done running you will get the following: -```{figure} ../figures/buildbook.PNG +```{figure} figures/buildbook.PNG Output ``` @@ -662,7 +660,7 @@ Note: use `--all` for the jupyter-book whenever building a book to make sure the Where book is the name of the folder containing all the files that make up your book. After `teachbooks` is done running you will get the following: -```{figure} ../figures/buildbook.PNG +```{figure} figures/buildbook.PNG Output ``` diff --git a/book/workflows/figures/Push_GitHubDesktop.PNG b/book/workflows/figures/Push_GitHubDesktop.PNG index 49d499ddaf27af8007d1ae6cf9477f3ccb9d5742..70c3275e72ec29ecadf844593d5bdab311450dc8 100644 GIT binary patch literal 12858 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 From 2bf5f39ead1ce2e832bdda8fa3e1b596f042e793 Mon Sep 17 00:00:00 2001 From: Julie Kirsch Date: Mon, 4 Nov 2024 22:05:56 +0100 Subject: [PATCH 09/10] equation error --- book/basic-features/equations.md | 8 +++++--- book/workflows/edit_book.md | 14 ++++++++------ book/workflows/figures/Push_GitHubDesktop2.PNG | Bin 22088 -> 0 bytes 3 files changed, 13 insertions(+), 9 deletions(-) delete mode 100644 book/workflows/figures/Push_GitHubDesktop2.PNG diff --git a/book/basic-features/equations.md b/book/basic-features/equations.md index 1aa80d1..e1684bd 100644 --- a/book/basic-features/equations.md +++ b/book/basic-features/equations.md @@ -1,6 +1,8 @@ # Equations -Equations can be included in two ways: inline or display mode. To make an inline equation, just put the LaTeX equation between \$-signs. For example, `$F = m \cdot a$` produces: $F = m \cdot a$. +Equations can be included in two ways: inline or display mode. + +To make an inline equation, just put the LaTeX equation between \$-signs. For example, `$F = m \cdot a$` produces: $F = m \cdot a$. Display mode equations (the ones that take up a whole line), can be inserted using double \$-signs, like this: @@ -35,9 +37,9 @@ Resulting in: $$ F = m \cdot a -$$ (newtons_second_law) +$$ (newtons_second_law_2) -Equation {eq}`newtons_second_law` can now be referred to. +Equation {eq}`newtons_second_law_2` can now be referred to. > **Note** > diff --git a/book/workflows/edit_book.md b/book/workflows/edit_book.md index a53b5b4..89d391a 100644 --- a/book/workflows/edit_book.md +++ b/book/workflows/edit_book.md @@ -158,23 +158,25 @@ Demonstration, video available [here](https://youtu.be/bThimdDRXTc) 1. Make some changes to a file in for example VS Code and save them. -2. Select the files ready to be added to Git-timeline (staging)
-For demonstration purposes, we have created a new Markdown file called `new-chapter.md`, which we want to add to the book. Since this is a new file, Git has no knowledge about its existence yet. I.e., the file is *untracked*. To add new files to our repository, we need to *stage* and *commit* them. To do this, open the Source Control menu in the left side bar. Our new file should appear in this menu: +2. Select the files ready to be added to Git-timeline (staging). + + For demonstration purposes, we have created a new Markdown file called `new-chapter.md`, which we want to add to the book. Since this is a new file, Git has no knowledge about its existence yet. I.e., the file is *untracked*. To add new files to our repository, we need to *stage* and *commit* them. To do this, open the Source Control menu in the left side bar. Our new file should appear in this menu: ```{figure} ../images/git-new-file.png The new file appears in the Source Control menu. ``` -Notice that there is a green letter U placed besides the file, meaning that our file is untracked. To add a file to the *staging area*, click on the + that appears when you hover over the file. + Notice that there is a green letter U placed besides the file, meaning that our file is untracked. To add a file to the *staging area*, click on the + that appears when you hover over the file. -3. Adding changes to the Git-timeline (committing)
-Next, in the field that says "Message", write a short description of the changes you have made. This message is what is called the *Commit Message*. After we've done this, the menu should now look something like this: +3. Adding changes to the Git-timeline (committing) + + Next, in the field that says "Message", write a short description of the changes you have made. This message is what is called the *Commit Message*. After we've done this, the menu should now look something like this: ```{figure} ../images/git-file-added.png The new file has been staged, and we've written a Commit Message. ``` -Now, we are ready to add the changes to the repository. This is done by *committing* the staged changes. To do this, simply press the big, blue "Commit" button in the Source Control menu. + Now, we are ready to add the changes to the repository. This is done by *committing* the staged changes. To do this, simply press the big, blue "Commit" button in the Source Control menu. 4. In the bottom left corner, next to the branch name, click the "Synchronize Changes" button (the one that looks like this: 🔄, highlighted in the image below) to push the changes to GitLab. diff --git a/book/workflows/figures/Push_GitHubDesktop2.PNG b/book/workflows/figures/Push_GitHubDesktop2.PNG deleted file mode 100644 index ff74fb973c484bc03e23fd77fe4e37ebbf67f2ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22088 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 A>;M1& From 71ee9610a605a56c9faa6bea3e5a6e5fd8d4a1f4 Mon Sep 17 00:00:00 2001 From: Julie Kirsch Date: Mon, 4 Nov 2024 22:28:40 +0100 Subject: [PATCH 10/10] some more fixes --- book/basic-features/References.md | 5 +++-- book/examples/h5p_examples.md | 3 ++- book/workflows/edit_book.md | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/book/basic-features/References.md b/book/basic-features/References.md index 1a8c1ee..c2e5a27 100644 --- a/book/basic-features/References.md +++ b/book/basic-features/References.md @@ -8,7 +8,8 @@ To make references to figures, equations et cetera, use the following syntax: **Examples** -Using ``{numref}`Figure {number} ` `` produces the output: {numref}`Figure {number} `. +- Using ``{numref}`Figure {number} ` `` produces the output: {numref}`Figure {number} `. + ```{figure} ../images/git-push.png --- width: 50% @@ -17,7 +18,7 @@ name: fig-gitpush Some caption here ``` -Or, the derivation results in equation {eq}``. +- Using ``{eq}`` `` to refer to Newton's second law {eq}`eq:Newton`. $$ F = m\cdot a $$(eq:Newton) diff --git a/book/examples/h5p_examples.md b/book/examples/h5p_examples.md index 85ea397..bce73d9 100644 --- a/book/examples/h5p_examples.md +++ b/book/examples/h5p_examples.md @@ -5,7 +5,8 @@ This page will show some examples of H5p quizzes built into a variety of TeachBo ## Getting started with H5p Some best-practices on the use of H5p: - - To startup your H5p-account, first login to H5p via Brightspace (follow instructions as under [https://www.tudelft.nl/teaching-support/educational-tools/h5p](https://www.tudelft.nl/teaching-support/educational-tools/h5p)). After that, direct login is possible via [tudelft.h5p.com](tudelft.h5p.com) + - To startup your H5p-account, first login to H5p via Brightspace. You can follow instructions as under [https://www.tudelft.nl/teaching-support/educational-tools/h5p](https://www.tudelft.nl/teaching-support/educational-tools/h5p). + - After that, direct login is possible via [tudelft.h5p.com](https://tudelft.h5p.com) - Place your H5p-elements in a shared folder in H5p. - Disable the display options "Toolbar Below Content" and "Display author's name to public (anonymous users) (only relevant when content's status is set to Public )" for each diff --git a/book/workflows/edit_book.md b/book/workflows/edit_book.md index 89d391a..7dd100a 100644 --- a/book/workflows/edit_book.md +++ b/book/workflows/edit_book.md @@ -702,7 +702,7 @@ Alternatively, you can also click on `Push origin` in the top bar. Using this feature, you can open VS Code in your browser and edit the files in your repository. This can be really useful for **quick fixes** when you dont want to launch GitHub Dekstop or VS Code. However, we would recommend to limit the use of this feature to quick changes as the other workflows allow for more complex tasks. -```{include} githu_dev.md +```{include} github_dev.md ``` ````