From 2998cccec9c09cc63fa62c51ca24b4b565370ce4 Mon Sep 17 00:00:00 2001 From: smolbat <33392352+smolbat@users.noreply.github.com> Date: Wed, 23 Oct 2024 21:57:43 +0300 Subject: [PATCH 1/3] Update Create-PullRequest.md Signed-off-by: smolbat <33392352+smolbat@users.noreply.github.com> --- ch3_pull-request/Create-PullRequest.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/ch3_pull-request/Create-PullRequest.md b/ch3_pull-request/Create-PullRequest.md index 3cd961b2..c1386a3c 100644 --- a/ch3_pull-request/Create-PullRequest.md +++ b/ch3_pull-request/Create-PullRequest.md @@ -6,31 +6,33 @@ In Chapter 3 - _Teamwork and Collaborative Development_ we learn how to collabo 2. Delete the following line: - __Delete this line__ + 3. Add one or two lines here with a random text: __...__ + __Test text 1111__ + __Test text 123__ -4. Modify the following line by removing the letters that do not belong: +5. Modify the following line by removing the letters that do not belong: - __---> The ccow jumpedd ovverr thhe mooon__ + __---> The cow jumped over the moon__ -5. Commit your changes into a new _branch_: +6. Commit your changes into a new _branch_: ![Commit Changes](img/commit.png) -6. In the next screen create the pull request by completing the title and description. Note the complete markdown support that we've seen in Chapter 2 for issues: +7. In the next screen create the pull request by completing the title and description. Note the complete markdown support that we've seen in Chapter 2 for issues: ![Create pr](img/create-pr.png) Make sure that the pull request uses base:main and not the upstream repository. This should be correct by default. -7. Got to `Files changed` and note the changes (deleted lines red, added lines green). Add a comment to a line by clicking the `+`at the beginning of the line when hovering with the mouse over it. Add a comment to line nine and click `Add single comment`. +8. Got to `Files changed` and note the changes (deleted lines red, added lines green). Add a comment to a line by clicking the `+`at the beginning of the line when hovering with the mouse over it. Add a comment to line nine and click `Add single comment`. ![Comment on changes](img/comment.png) -8. Edit the file opening the menu in the top right corner and selecting `Edit file`. +9. Edit the file opening the menu in the top right corner and selecting `Edit file`. ![Edit file](img/edit-file.png) From 57b8b1e1b612dfe42f345f48170fd02122829c60 Mon Sep 17 00:00:00 2001 From: smolbat <33392352+smolbat@users.noreply.github.com> Date: Wed, 23 Oct 2024 22:10:01 +0300 Subject: [PATCH 2/3] Update Create-PullRequest.md 2222 test test test Signed-off-by: smolbat <33392352+smolbat@users.noreply.github.com> --- ch3_pull-request/Create-PullRequest.md | 1 - 1 file changed, 1 deletion(-) diff --git a/ch3_pull-request/Create-PullRequest.md b/ch3_pull-request/Create-PullRequest.md index c1386a3c..dc00af3b 100644 --- a/ch3_pull-request/Create-PullRequest.md +++ b/ch3_pull-request/Create-PullRequest.md @@ -10,7 +10,6 @@ In Chapter 3 - _Teamwork and Collaborative Development_ we learn how to collabo 3. Add one or two lines here with a random text: - __...__ __Test text 1111__ __Test text 123__ From ab554cc2d85c5190359f3422223c3e43f1f545bc Mon Sep 17 00:00:00 2001 From: smolbat <33392352+smolbat@users.noreply.github.com> Date: Wed, 23 Oct 2024 22:23:02 +0300 Subject: [PATCH 3/3] Update Create-PullRequest.md 33333 tyuiopghjkl Signed-off-by: smolbat <33392352+smolbat@users.noreply.github.com> --- ch3_pull-request/Create-PullRequest.md | 1 - 1 file changed, 1 deletion(-) diff --git a/ch3_pull-request/Create-PullRequest.md b/ch3_pull-request/Create-PullRequest.md index dc00af3b..b069cdd0 100644 --- a/ch3_pull-request/Create-PullRequest.md +++ b/ch3_pull-request/Create-PullRequest.md @@ -11,7 +11,6 @@ In Chapter 3 - _Teamwork and Collaborative Development_ we learn how to collabo 3. Add one or two lines here with a random text: __Test text 1111__ - __Test text 123__ 5. Modify the following line by removing the letters that do not belong: