From 8e0688f5e4051b803298c42e0f1d7078350ca2ca Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Mon, 27 May 2024 14:02:18 +0200 Subject: [PATCH] Solve it here too --- 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 f79e0b4..e684e47 100644 --- a/book/workflows/edit_book.md +++ b/book/workflows/edit_book.md @@ -234,7 +234,7 @@ After committing, click the 🔄 button to push our changes to the remote reposi Example Image -In this case there are two conflicted files. GitHub Desktop is suggesting to resolve the changes in VS Code. Click on `Open in Visual Studio Code`. +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.
Example Image @@ -526,7 +526,7 @@ After committing, click the 🔄 button to push our changes to the remote reposi 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 conlict directly in GitHub Dekstop by choosing the branch of the file you want to keep. +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. 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.