From 5767869c5f2ce0ec1f627965ff35ef7688914aa5 Mon Sep 17 00:00:00 2001 From: test Date: Sun, 16 Feb 2025 21:45:02 +0000 Subject: [PATCH 1/2] checks and updates all the condition regex --- .../sec-cloning-your-origin.ptx | 12 ++++++------ .../sec-extra-practice.ptx | 4 ++-- .../sec-forking-the-upstream.ptx | 16 ++++++++-------- .../sec-github-set-up.ptx | 2 +- .../sec-the-issue-tracker.ptx | 12 ++++++++++-- source/ch-merge-conflicts/sec-extra-practice.ptx | 2 +- ...ing-the-main-branch-into-a-feature-branch.ptx | 7 ------- .../sec-updating-your-pull-request.ptx | 2 +- .../sec-creating-a-pull-request.ptx | 2 +- .../sec-editing-local-files.ptx | 4 ++-- .../sec-staging-changes.ptx | 7 +++++++ 11 files changed, 39 insertions(+), 31 deletions(-) diff --git a/source/ch-communities-and-collaboration/sec-cloning-your-origin.ptx b/source/ch-communities-and-collaboration/sec-cloning-your-origin.ptx index bfb2141..8a9f660 100644 --- a/source/ch-communities-and-collaboration/sec-cloning-your-origin.ptx +++ b/source/ch-communities-and-collaboration/sec-cloning-your-origin.ptx @@ -84,20 +84,20 @@

- +

Thank you.

- +

It looks like you might be trying to use the upstream repository instead of your origin.

- +

@@ -152,20 +152,20 @@

- +

Thank you.

- +

It looks like you might be trying to use the upstream repository instead of your origin.

- +

diff --git a/source/ch-communities-and-collaboration/sec-extra-practice.ptx b/source/ch-communities-and-collaboration/sec-extra-practice.ptx index c7d620d..2f5d522 100644 --- a/source/ch-communities-and-collaboration/sec-extra-practice.ptx +++ b/source/ch-communities-and-collaboration/sec-extra-practice.ptx @@ -87,7 +87,7 @@ - +

Thank you. @@ -105,7 +105,7 @@

- Make sure you are giving the URL for your fork, not the project's URL. Review for information on how to fork a repository on GitHub. + Make sure you are giving the URL for your fork, not the project's upstream URL. Review for information on how to fork a repository on GitHub.

diff --git a/source/ch-communities-and-collaboration/sec-forking-the-upstream.ptx b/source/ch-communities-and-collaboration/sec-forking-the-upstream.ptx index 163f862..e7bd846 100644 --- a/source/ch-communities-and-collaboration/sec-forking-the-upstream.ptx +++ b/source/ch-communities-and-collaboration/sec-forking-the-upstream.ptx @@ -51,28 +51,28 @@ - +

Thank you.

- +

Looks like you might be trying to use the real FarmData2 upstream. Be sure to use the URL that your instructor has given you.

- +

Looks like you might be trying to use the real FarmData2 upstream. Be sure to use the URL that your instructor has given you.

- +

Looks like you might be trying to use the example above. That was just for illustration. Be sure to use the URL that your instructor has given you. @@ -156,28 +156,28 @@ - +

Thank you.

- +

Looks like you might be giving the URL of the real FarmData2 upstream. Be sure to give the URL of the fork you created in your GitHub space.

- +

Looks like you might be trying to use the real FarmData2 upstream. Be sure to give the URL of the fork you created in your GitHub space.

- +

Looks like you might be trying to use the example above. That was just for illustration. Be sure to use the URL that your instructor has given you. diff --git a/source/ch-communities-and-collaboration/sec-github-set-up.ptx b/source/ch-communities-and-collaboration/sec-github-set-up.ptx index e01f4ac..9480ff8 100644 --- a/source/ch-communities-and-collaboration/sec-github-set-up.ptx +++ b/source/ch-communities-and-collaboration/sec-github-set-up.ptx @@ -38,7 +38,7 @@

- +

Thank you. diff --git a/source/ch-communities-and-collaboration/sec-the-issue-tracker.ptx b/source/ch-communities-and-collaboration/sec-the-issue-tracker.ptx index f2a7dea..bb46bd4 100644 --- a/source/ch-communities-and-collaboration/sec-the-issue-tracker.ptx +++ b/source/ch-communities-and-collaboration/sec-the-issue-tracker.ptx @@ -472,13 +472,21 @@

- +

Thank you.

- + + + +

+ Looks like you are trying to use the example above. Be sure to use the URL for your actual issue. +

+ + +

diff --git a/source/ch-merge-conflicts/sec-extra-practice.ptx b/source/ch-merge-conflicts/sec-extra-practice.ptx index 115d485..98fd7a1 100644 --- a/source/ch-merge-conflicts/sec-extra-practice.ptx +++ b/source/ch-merge-conflicts/sec-extra-practice.ptx @@ -355,7 +355,7 @@ - +

Thank you. diff --git a/source/ch-merge-conflicts/sec-merging-the-main-branch-into-a-feature-branch.ptx b/source/ch-merge-conflicts/sec-merging-the-main-branch-into-a-feature-branch.ptx index aaeb5ca..d361908 100644 --- a/source/ch-merge-conflicts/sec-merging-the-main-branch-into-a-feature-branch.ptx +++ b/source/ch-merge-conflicts/sec-merging-the-main-branch-into-a-feature-branch.ptx @@ -235,13 +235,6 @@

- - -

- Review the format of the git merge command above. -

- -

diff --git a/source/ch-merge-conflicts/sec-updating-your-pull-request.ptx b/source/ch-merge-conflicts/sec-updating-your-pull-request.ptx index b33acdc..54a063d 100644 --- a/source/ch-merge-conflicts/sec-updating-your-pull-request.ptx +++ b/source/ch-merge-conflicts/sec-updating-your-pull-request.ptx @@ -49,7 +49,7 @@

- +

Review the git push command in . diff --git a/source/ch-upstreaming-changes/sec-creating-a-pull-request.ptx b/source/ch-upstreaming-changes/sec-creating-a-pull-request.ptx index 96595c4..40ced9e 100644 --- a/source/ch-upstreaming-changes/sec-creating-a-pull-request.ptx +++ b/source/ch-upstreaming-changes/sec-creating-a-pull-request.ptx @@ -235,7 +235,7 @@

- + diff --git a/source/ch-upstreaming-changes/sec-editing-local-files.ptx b/source/ch-upstreaming-changes/sec-editing-local-files.ptx index a163621..0fe5a8d 100644 --- a/source/ch-upstreaming-changes/sec-editing-local-files.ptx +++ b/source/ch-upstreaming-changes/sec-editing-local-files.ptx @@ -27,7 +27,7 @@

- +

Thank you. @@ -37,7 +37,7 @@

- Make sure you have pasted the complete URL starting with https and ending with the issue number. + Make sure you have pasted the complete URL starting with https and ending with the issue number that you have been assigned.

diff --git a/source/ch-upstreaming-changes/sec-staging-changes.ptx b/source/ch-upstreaming-changes/sec-staging-changes.ptx index 3480d14..a131821 100644 --- a/source/ch-upstreaming-changes/sec-staging-changes.ptx +++ b/source/ch-upstreaming-changes/sec-staging-changes.ptx @@ -64,6 +64,13 @@

+ + +

+ Check the format of your git stage command. +

+ + From 0b208f7c7d106b42c6a9feea4241d5ac7cd35e8b Mon Sep 17 00:00:00 2001 From: test Date: Sun, 16 Feb 2025 22:34:58 +0000 Subject: [PATCH 2/2] ensured all regex accept correct answers + small edits --- .../sec-cloning-your-origin.ptx | 53 +++++++++---------- .../sec-github-set-up.ptx | 12 ++++- .../sec-the-issue-tracker.ptx | 2 +- .../ch-merge-conflicts/sec-extra-practice.ptx | 4 +- ...ec-committing-to-your-local-repository.ptx | 18 ++++++- .../sec-creating-a-pull-request.ptx | 11 ++-- .../sec-staging-changes.ptx | 4 +- 7 files changed, 63 insertions(+), 41 deletions(-) diff --git a/source/ch-communities-and-collaboration/sec-cloning-your-origin.ptx b/source/ch-communities-and-collaboration/sec-cloning-your-origin.ptx index 8a9f660..f357986 100644 --- a/source/ch-communities-and-collaboration/sec-cloning-your-origin.ptx +++ b/source/ch-communities-and-collaboration/sec-cloning-your-origin.ptx @@ -152,34 +152,31 @@

- - -

- Thank you. -

- - - - -

- It looks like you might be trying to use the upstream repository instead of your origin. -

- - - - -

- It looks like you might be trying to use the upstream repository instead of your origin. -

- - - - -

- Be sure to replace <URL> with the clone URL you found in . The clone URL should have the format https://github.com/yourGitHubUsername/theRepoName.git. -

- - + + + + +

+ Thank you. +

+ + + + +

+ It looks like you might be trying to clone the upstream repository instead of your origin. +

+ + + + +

+ Be sure to replace the URL with the clone URL you found in . The clone URL should have the format https://github.com/yourGitHubUsername/theRepoName.git. +

+ + + +

diff --git a/source/ch-communities-and-collaboration/sec-github-set-up.ptx b/source/ch-communities-and-collaboration/sec-github-set-up.ptx index 9480ff8..56c19ff 100644 --- a/source/ch-communities-and-collaboration/sec-github-set-up.ptx +++ b/source/ch-communities-and-collaboration/sec-github-set-up.ptx @@ -38,13 +38,21 @@

- +

Thank you.

- + + + +

+ Looks like you are using the example given. Be sure to give the URL of your actual GitHub profile. +

+ + +

diff --git a/source/ch-communities-and-collaboration/sec-the-issue-tracker.ptx b/source/ch-communities-and-collaboration/sec-the-issue-tracker.ptx index bb46bd4..5a2629b 100644 --- a/source/ch-communities-and-collaboration/sec-the-issue-tracker.ptx +++ b/source/ch-communities-and-collaboration/sec-the-issue-tracker.ptx @@ -472,7 +472,7 @@

- +

Thank you. diff --git a/source/ch-merge-conflicts/sec-extra-practice.ptx b/source/ch-merge-conflicts/sec-extra-practice.ptx index 98fd7a1..fdd4119 100644 --- a/source/ch-merge-conflicts/sec-extra-practice.ptx +++ b/source/ch-merge-conflicts/sec-extra-practice.ptx @@ -355,7 +355,7 @@ - +

Thank you. @@ -365,7 +365,7 @@

- Be sure that your URL is from your pull request to the upstream repository. It should have the format https://github.com/upstreamLocation/upstreamReop/pulls/xx, where xx is a number. + Be sure that your URL is from your pull request to the upstream repository for your course. It should have the format https://github.com/yourCourse/repoName/pulls/xx, where xx is a number.

diff --git a/source/ch-upstreaming-changes/sec-committing-to-your-local-repository.ptx b/source/ch-upstreaming-changes/sec-committing-to-your-local-repository.ptx index 464b3fd..764bc0d 100644 --- a/source/ch-upstreaming-changes/sec-committing-to-your-local-repository.ptx +++ b/source/ch-upstreaming-changes/sec-committing-to-your-local-repository.ptx @@ -112,12 +112,12 @@

- +

- +

Thank you. @@ -125,6 +125,20 @@

+ + +

+ Try using a longer commit message to be more descriptive. +

+ + + + +

+ Try using a more concise commit message. +

+ + diff --git a/source/ch-upstreaming-changes/sec-creating-a-pull-request.ptx b/source/ch-upstreaming-changes/sec-creating-a-pull-request.ptx index 40ced9e..a4e48dc 100644 --- a/source/ch-upstreaming-changes/sec-creating-a-pull-request.ptx +++ b/source/ch-upstreaming-changes/sec-creating-a-pull-request.ptx @@ -235,14 +235,17 @@

- - + + +

+ Thank you. +

+

- The upstream repository is the repository you forked from. - Double check that you aren't in your origin repository. + Double check the URL of your pull request to ensure that it is in the upstream for your course and is correct.

diff --git a/source/ch-upstreaming-changes/sec-staging-changes.ptx b/source/ch-upstreaming-changes/sec-staging-changes.ptx index a131821..7da3d71 100644 --- a/source/ch-upstreaming-changes/sec-staging-changes.ptx +++ b/source/ch-upstreaming-changes/sec-staging-changes.ptx @@ -50,14 +50,14 @@ - +

Thank you.

- +

Are you sure that is the file that the issue asked you to edit?