diff --git a/book/workflows/edit_book.md b/book/workflows/edit_book.md index 118501e..f79e0b4 100644 --- a/book/workflows/edit_book.md +++ b/book/workflows/edit_book.md @@ -445,7 +445,7 @@ By clicking on the 🔄 button, you will pull your colleages' changes. 2. 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 repositery, 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.
- Example Image + Example Image
The figure above shows the conflicts. If you look closely you can see that the last couple of words of the paragraph are different in the main branch than in the branch we were working in. There are a couple of options in the top bar: @@ -523,20 +523,10 @@ After committing, click the 🔄 button to push our changes to the remote reposi 2. 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 repositery, 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. Click on `Open in Visual Studio Code`. - -
- Example Image -
- -The figure above shows the conflicts. If you look closely you can see that the last couple of words of the paragraph are different in the main branch than in the branch we were working in. There are a couple of options in the top bar: - -- `Accept Current Change` will keep the change in your branch -- `Accept Incoming Change` will keep the change from the main branch (the branch you are merging into your branch) -- `Accept Both Changes` will retain both paragraphs +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. 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. diff --git a/book/workflows/figures/Merge_Conflict_GitHubDesktop.PNG b/book/workflows/figures/Merge_Conflict_GitHubDesktop.PNG new file mode 100644 index 0000000..57f55d6 Binary files /dev/null and b/book/workflows/figures/Merge_Conflict_GitHubDesktop.PNG differ diff --git a/book/workflows/figures/Merge_Conflict_GitHubDesktop2.PNG b/book/workflows/figures/Merge_Conflict_GitHubDesktop2.PNG new file mode 100644 index 0000000..905b7e8 Binary files /dev/null and b/book/workflows/figures/Merge_Conflict_GitHubDesktop2.PNG differ diff --git a/book/workflows/merge_request.md b/book/workflows/merge_request.md index 4f79533..10a4208 100644 --- a/book/workflows/merge_request.md +++ b/book/workflows/merge_request.md @@ -47,7 +47,7 @@ Solving the conflict. ``` Once you are done, click on `Commit to source branch`. Do this for all conflicted files. Note that if your branches do not have conflicting changes you can merge directly and skip this step. In that case you can skip ahead to the next step. -In case you have cloned the repositery you can also resolve the conflicts locally using VS Code for example. You can read more about it [here](edit_book.md#... GitHub Desktop) +In case you have cloned the repositery you can also resolve the conflicts locally using VS Code for example. You can read more about for [GitHub Dekstop](edit_book.md#... GitHub Desktop) or [VS Code](edit_book.md#... VS Code) 6. On the page of our merge request ({numref}`gitlab-finished-merge-request`), we're greeted with some more information. On top, you can read the description we just provided when creating the merge request. We can also see an "Approve" button, which you may or may not see, depending on your repository rights. Next, we can see a green checkmark, with a "Merge" button. This is good news: our changes do not conflict with existing files on the `main` branch, and we can merge our changes directly by clicking the button (if applicable: only after somebody else approved the request).