Skip to content
This repository was archived by the owner on Feb 18, 2025. It is now read-only.

Revisions to chapter 3. #180

Merged
braughtg merged 10 commits into from
Feb 16, 2025
Merged

Revisions to chapter 3. #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9598dcc
issues #148 and #153
kwurst Feb 10, 2025
57c51ed
fix pull request regex
kwurst Feb 10, 2025
308f23a
update 2.4.2.d hint (#173)
kwurst Feb 12, 2025
91e614a
Merge branch 'jan-25-sprint' into jan-25-sprint-chap-3
kwurst Feb 14, 2025
3e73370
3.6
kwurst Feb 14, 2025
311695d
3.6
kwurst Feb 14, 2025
779667e
3.7
kwurst Feb 14, 2025
90c87eb
3.8
kwurst Feb 14, 2025
f4c08f7
fix merge conflict
kwurst Feb 14, 2025
7e7dd34
Merge branch 'jan-25-sprint' into jan-25-sprint-chap-3
braughtg Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions source/ch-communities-and-collaboration/sec-the-issue-tracker.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@
</hint>
</task>


<task xml:id="ex-explore-the-issue-tracker-d" label="ex-explore-the-issue-tracker-d" >
<statement>
<p>
Expand Down Expand Up @@ -287,7 +286,6 @@
</hint>
</task>


<task xml:id="ex-explore-the-issue-tracker-e" label="ex-explore-the-issue-tracker-e" >
<statement>
<p>
Expand Down
91 changes: 22 additions & 69 deletions source/ch-upstreaming-changes/sec-committing-to-your-local-repository.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@
<var width="55" />
</p>
</statement>
<setup> <var> <condition string='^git commit -m ["].+["]$'>
<setup>
<var>
<condition string='^git commit -m ["].+["]$'>
<feedback>
<p>
Thank you.
Expand All @@ -130,7 +132,9 @@
Double check the format of your command.
</p>
</feedback>
</condition> </var> </setup>
</condition>
</var>
</setup>
</exercise>

<exercise xml:id="ex-committing-changes-new-a" label="ex-committing-changes-new-a">
Expand All @@ -149,7 +153,7 @@
<choice>
<statement>
<p>
It shows the name of the file changed in [].
It shows the name of the file changed in the square brackets [ ].
</p>
</statement>

Expand All @@ -163,7 +167,7 @@
<choice correct="yes">
<statement>
<p>
It shows the name of the feature branch that contains the change in [].
It shows the name of the feature branch that contains the change in the square brackets [ ].
</p>
</statement>

Expand All @@ -177,7 +181,7 @@
<choice correct="yes">
<statement>
<p>
It shows the SHA code of the commit in [].
It shows the SHA code of the commit in the square brackets [ ].
</p>
</statement>

Expand Down Expand Up @@ -259,7 +263,7 @@
<statement>
<p>
Now use the <c>git status</c> command again.
Compare your output to the output in <xref ref="ex-staging-changes-b" />.
Compare your output to the output in <xref ref="ex-staging-changes-b"/>.
What two changes have occurred that reflect that your changes have been staged?
</p>
</statement>
Expand Down Expand Up @@ -305,76 +309,50 @@
</hint>
</task>


<task xml:id="ex-committing-changes-c" label="ex-committing-changes-c">
<statement>
<p>
How do you know your changes have been committed?
</p>
</statement>


<choices>
<choice correct="yes">
<statement>
<p>
Option 1
The <c>git commit</c> message showed a new SHA.
</p>
</statement>

<feedback>
<p>
Feedback 1
</p>
</feedback>
</choice>

<choice>
<choice correct="yes">
<statement>
<p>
Option 2
The <c>git status</c> command does not show the files you modified for your change.
</p>
</statement>

<feedback>
<p>
Feedback 2
</p>
</feedback>
</choice>

<choice>
<statement>
<p>
Option 3
The <c>git status</c> command shows your modified files in green.
</p>
</statement>

<feedback>
<p>
Feedback 3
</p>
</feedback>
</choice>

<choice>
<statement>
<p>
Option 4
The <c>git commit</c> message says "no changes added to commit".
</p>
</statement>

<feedback>
<p>
Feedback 4
</p>
</feedback>
</choice>
</choices>

<hint>
<p>
Hint here
There should be no modified files that are still staged and the <c>git commit</c> should have showed you the number of lines changed.
</p>
</hint>
</task>
Expand All @@ -393,35 +371,24 @@
<choice correct="yes">
<statement>
<p>
Option 1
The top commit shown is your latest commit.
</p>
</statement>

<feedback>
<p>
Feedback 1
</p>
</feedback>
</choice>

<choice>
<statement>
<p>
Option 2
The bottom commit shown is your latest commit.
</p>
</statement>

<feedback>
<p>
Feedback 2
</p>
</feedback>
</choice>

<choice>
<statement>
<p>
Option 3
Your commit is not shown.
</p>
</statement>

Expand All @@ -431,25 +398,11 @@
</p>
</feedback>
</choice>

<choice>
<statement>
<p>
Option 4
</p>
</statement>

<feedback>
<p>
Feedback 4
</p>
</feedback>
</choice>
</choices>

<hint>
<p>
Hint here
The log shows the latest commits first.
</p>
</hint>
</task>
Expand Down Expand Up @@ -531,15 +484,15 @@


<task xml:id="ex-committing-changes-f" label="ex-committing-changes-f">
<statement correct="yes">
<statement correct="no">
<p>
The output of the <c>git log</c> command now shows the information about the commit you made.
</p>
</statement>

<hint>
<p>
What branch are you on, the <c>main</c> branch our your feature branch? In which branch did you make your changes?
What branch are you on, the <c>main</c> branch or your feature branch? In which branch did you make your changes?
</p>
</hint>
</task>
Expand Down
37 changes: 3 additions & 34 deletions source/ch-upstreaming-changes/sec-creating-a-pull-request.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,35 +87,7 @@
The questions in this exercise will help you to better understand what this information means.
</p>
</introduction>
<!--
<task xml:id="ex-pull-request-b-i" label="ex-pull-request-b-i">
<introduction>
<p>
Copy the URLs from the gray bar into the textboxes below.
</p>
</introduction>


<task xml:id="ex-pull-request-b-i-a" label="ex-pull-request-b-i-a">
<statement>
<p>
Base Repository
</p>
</statement>
<response />
</task>


<task xml:id="ex-pull-request-b-i-b" label="ex-pull-request-b-i-b">
<statement>
<p>
Head Repository
</p>
</statement>
<response />
</task>
</task>
-->

<task xml:id="ex-pull-request-b-ii" label="ex-pull-request-b-ii">
<statement>
<p>
Expand Down Expand Up @@ -154,7 +126,7 @@
<hint>
<p>
The base is where you want your changes merged into.
The head is where your changes are being pulled from.
The compare is where your changes are being pulled from.
</p>
</hint>
</task>
Expand Down Expand Up @@ -264,7 +236,7 @@
</p>
</statement>
<setup> <var> <condition string='^https://github.com/(?!(FarmData2/FarmData2|DickinsonCollege/FarmData2))(.+/.+)/pull/[0-9]+$'>
</feedback>
<feedback></feedback>
</condition> <condition string=".*">

<feedback>
Expand Down Expand Up @@ -305,9 +277,6 @@
It also indicates the changes you have made.
The project maintainers will often use this diff to see the details of what you have changed.
</p>
<!--
<task xml:id="ex-pull-request-files-a" label="ex-pull-request-files-a">
-->
<p>
Which of the following describes how the diff indicates the changes that you made?
</p>
Expand Down
60 changes: 1 addition & 59 deletions source/ch-upstreaming-changes/sec-pushing-a-branch-to-your-origin.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,57 +266,7 @@
</hint>
</task>
</exercise>
<!--
<p>
<term>Getting a Personal Access Token: </term>
</p>

<p>
Before you will be able to push your <em>feature branch</em> to GitHub you will have to get a <term>Personal Access Token (PAT)</term> from GitHub.
A PAT is like a password but has some security benefits.
In particular, you can have multiple different PATs.
Each one can have different limits on what can be done with it and each one can be revoked individually without affecting the others.
</p>

<p>
When interacting with GitHub using the git CLI (e.g.
when pushing a branch), GitHub requires that you use a PAT for authentication instead of your password.
</p>

<exercise xml:id="ex-getting-pat-remove" label="ex-getting-pat-remove">
<introduction>
<p>
Follow GitHub's instructions for creating a (classic) personal access token: <url href="https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token#creating-a-personal-access-token-classic" visual="docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token#creating-a-personal-access-token-classic">Creating a Personal Access Token (classic)</url>.
</p>

<p>
When doing so be sure to:
<ul>
<li>
<p>
Choose “repo” for the “scopes and permissions.”
</p>
</li>

<li>
<p>
Be sure to copy and paste your PAT somewhere safe – maybe e-mail it to yourself.
You will not be able to retrieve it again after you leave the page.
</p>
</li>
</ul>
</p>

<p>
Note: Typing or even copy and pasting your PAT every time it is needed can be a hassle.
To help, the git CLI provides what is known as the <term>credential helper</term>.
The git CLI in the KitClient has configured the credential helper so that your PAT will be stored when you enter it the first time.
It will then be used automatically for future commands.
If you are curious, you can learn more about the credential helper here: <url href="https://techexpertise.medium.com/storing-git-credentials-with-git-credential-helper-33d22a6b5ce7" visual="techexpertise.medium.com/storing-git-credentials-with-git-credential-helper-33d22a6b5ce7">Storing Git Credentials with Git Credential Helper</url>.
</p>
</introduction>
</exercise>
-->
<p>
<term>Pushing your Feature Branch: </term>
</p>
Expand All @@ -341,14 +291,6 @@
The last few lines should also give you some indication that your push was successful.
Look at the last two lines of output produced.
</p>
<!--
<p>
Note: You can use the name of the remote repository, so you do not need to use the full URL.
You will also need to paste your PAT as the password when it is requested.
<em>The cursor will not move when you put in the PAT nor will you see any characters.
After you type or paste it hit Enter</em>
</p>
-->
</statement>


Expand Down Expand Up @@ -414,7 +356,7 @@
<p>
There are several lines of output that mention deltas.
Ignore these.
Make sure you are looking at the last two lines which begin with <em>To</em> and a hexademical code.
Make sure you are looking at the last two lines - the first of which begin with <em>To</em> and the second of which begins with a hexademical code.
</p>
</hint>
</exercise>
Expand Down