From 2fd8b0de4b3b1245045a7fc22bf3ba41546ae0f2 Mon Sep 17 00:00:00 2001 From: Julie Kirsch Date: Thu, 5 Dec 2024 23:27:57 +0100 Subject: [PATCH] fixes --- book/workflows/edit_book.md | 13 +++++++------ book/workflows/figures/Push_GitHubDekstop.PNG | Bin 0 -> 11600 bytes .../stage_commit_push_github_desktop.md | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 book/workflows/figures/Push_GitHubDekstop.PNG diff --git a/book/workflows/edit_book.md b/book/workflows/edit_book.md index 3e2e68f..1266890 100644 --- a/book/workflows/edit_book.md +++ b/book/workflows/edit_book.md @@ -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 Example Image -**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).
- Example Image + Example Image
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 ``` diff --git a/book/workflows/figures/Push_GitHubDekstop.PNG b/book/workflows/figures/Push_GitHubDekstop.PNG new file mode 100644 index 0000000000000000000000000000000000000000..4ab03411514d69d6f786a9b080aee7e7b54543ce GIT binary patch literal 11600 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