From 98b94ac59668a44706a3b8fb97fe2348ec4b389c Mon Sep 17 00:00:00 2001 From: Robert Nagy <36110768+robertn01@users.noreply.github.com> Date: Thu, 20 Aug 2020 00:54:55 +0100 Subject: [PATCH 1/3] Update 08-pull-request.md typo corrected in line 104: cimmit --> commit history --- _episodes/08-pull-request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_episodes/08-pull-request.md b/_episodes/08-pull-request.md index c6e5225258..0539bdaab8 100644 --- a/_episodes/08-pull-request.md +++ b/_episodes/08-pull-request.md @@ -101,7 +101,7 @@ The maintainer will most likely get an email about the new pull request,   Accepting the request is as simple as hitting the green button, **BUT BE - CAREFUL!**. Always look at the cimmit history, and check what changes + CAREFUL!**. Always look at the commit history, and check what changes are included in the pull request. You don't want the merge to break your code. Check the '`Commits`' and '`Files changed`' tabs to be sure. From 4a0702dbc4d628b58922741c3ffbd214b1283284 Mon Sep 17 00:00:00 2001 From: Robert Nagy <36110768+robertn01@users.noreply.github.com> Date: Thu, 20 Aug 2020 01:04:45 +0100 Subject: [PATCH 2/3] Update 08-pull-request.md corrected typos in lines 82 and 104: Kristin --> Kristen; cimmit --> commit history, respectively. --- _episodes/08-pull-request.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_episodes/08-pull-request.md b/_episodes/08-pull-request.md index 0539bdaab8..bfdc952bad 100644 --- a/_episodes/08-pull-request.md +++ b/_episodes/08-pull-request.md @@ -79,7 +79,7 @@ You'll use the Base Fork and Head Fork buttons to choose what to send where. (If Compare the changes you want to add to your pull request and send it off. (In the screen shots below, "deliciouslyevil" is the Dracula persona who's the repository maintainer -used in Software Carpentry examples, and "biologyguy" is the contributor who's submitting Kristin's +used in Software Carpentry examples, and "biologyguy" is the contributor who's submitting Kristen's edits to the central collection.) ![Forking repo (Step 1)](../fig/github-fork-03.png) @@ -106,7 +106,6 @@ Accepting the request is as simple as hitting the green button, **BUT BE your code. Check the '`Commits`' and '`Files changed`' tabs to be sure. ![Forking repo (Step 1)](../fig/github-fork-06.png) -   From 62c8353a6d8897d9b18a33a582d1dd694f42b0f6 Mon Sep 17 00:00:00 2001 From: Robert Nagy <36110768+robertn01@users.noreply.github.com> Date: Thu, 20 Aug 2020 01:07:29 +0100 Subject: [PATCH 3/3] Update 08-pull-request.md --- _episodes/08-pull-request.md | 1 + 1 file changed, 1 insertion(+) diff --git a/_episodes/08-pull-request.md b/_episodes/08-pull-request.md index bfdc952bad..28f24fceb8 100644 --- a/_episodes/08-pull-request.md +++ b/_episodes/08-pull-request.md @@ -106,6 +106,7 @@ Accepting the request is as simple as hitting the green button, **BUT BE your code. Check the '`Commits`' and '`Files changed`' tabs to be sure. ![Forking repo (Step 1)](../fig/github-fork-06.png) +