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

fixes

Browse source
This commit is contained in:
Julie Kirsch 2024-12-05 23:27:57 +01:00
parent b0cc01914a
commit 2fd8b0de4b
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
book/workflows/edit_book.md
View file

@ -205,7 +205,7 @@ If you collaborate with colleagues on your branch, you can get the updates from
By clicking on the 🔄 button, you will pull your colleages' changes.
**solving potential incompatible changes (merging conflicts)**
**Solving potential incompatible changes (merging conflicts)**
When multiple people work on one chapter, it is possible that conflicts will arise if you and your colleagues have made incompatible changes in the same branch. In that case, when pulling from the remote repository, Git in VS Code will recognize conflicts and help you to solve potential incompatible changes (merging conflicts). Open the files that are marked as conflicitng.
@ -221,7 +221,7 @@ The figure above shows the conflicts. If you look closely you can see that the l
Choose one of the options to resolve the merge conflict. You now have updated your work with work from your colleagues and resolved potential conlicts. You are now ready to continue working on the content.
**Make some further changes to a file in for example VS Code and save them.**
**Make some further changes to a file in for example VS Code and save them**
```{include} stage_commit_push_vscode.md
```
@ -237,12 +237,12 @@ If you collaborate with colleagues on your branch, you can get the updates from
<img src="figures/Fetch.PNG" alt="Example Image" width="650">
</figure>
**solving potential incompatible changes (merging conflicts)**
**Solving potential incompatible changes (merging conflicts)**
When multiple people work on one chapter, it is possible that conflicts will arise if you and your colleagues have made incompatible changes in the same branch. In that case, when pulling from the remote repository, GitHub Desktop will recognize conflicts and help you to solve potential incompatible changes (merging conflicts).
<figure align="center">
<img src="figures/Conflicts1.PNG" alt="Example Image" width="650">
<img src="figures/Conflicts1.PNG" alt="Example Image" width="450">
</figure>
In this case there are two conflicted files. GitHub Desktop is suggesting to resolve the changes in VS Code (in that case have a look at the section treating VS Code). By clicking on the small downwards arrow you can also solve the conflict directly in GitHub Desktop by choosing the branch of the file you want to keep.
@ -301,7 +301,7 @@ name: user5_demo
Demonstration, video available [here](https://youtu.be/2ttjBevkEP8)
```
**Make some changes to a file in for example VS Code and save them.**
**Make some changes to a file in for example VS Code and save them**
```{include} user45_check_changes.md
```
@ -309,9 +309,10 @@ Demonstration, video available [here](https://youtu.be/2ttjBevkEP8)
```{include} stage_commit_push_vscode.md
```
````
````{tab-item} ... GitHub Desktop
**Make some changes to a file in for example VS Code and save them.**
**Make some changes to a file in for example VS Code and save them**
```{include} user45_check_changes.md
```

BIN
book/workflows/figures/Push_GitHubDekstop.PNG Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

2
book/workflows/stage_commit_push_github_desktop.md
View file

@ -19,7 +19,7 @@ Now we need to add changes to GitHub/GitLab. This is called pushing to the remot
```{figure} figures/Push_GitHubDekstop.PNG
---
width: 100%
width: 80%
---
Push origin
```