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 b0cff98..c135b92 100644 --- a/source/ch-communities-and-collaboration/sec-cloning-your-origin.ptx +++ b/source/ch-communities-and-collaboration/sec-cloning-your-origin.ptx @@ -630,10 +630,10 @@ - Opening the GitKit-FarmData2 Repository Folder + Opening the GitKit FarmData2 Repository Folder

- You cloned your GitKit-FarmData2 respitory into a folder in your development environment with the command in . + You cloned your fork of the GitKit FarmData2 upstream repository into a folder in your development environment with the command in .

@@ -646,7 +646,7 @@

- Open the GitKit-FarmData2 folder. + Open your clone of the GitKit FarmData2 repository.

You can do this by going to the "hamburger" (≡) menu in the upper left of your development environment window. @@ -655,7 +655,7 @@ Choose File > Open Folder...

- Select the GitKit-FarmData2 folder and click OK. + Select the folder containing your clone of the GitKit FarmData2 and click OK.

You will see Setting up your Codespace, and then your terminal will show a message from the Kit-tty. diff --git a/source/ch-instructor-guide/sec-instructor-communities.ptx b/source/ch-instructor-guide/sec-instructor-communities.ptx index 77644ed..927447e 100644 --- a/source/ch-instructor-guide/sec-instructor-communities.ptx +++ b/source/ch-instructor-guide/sec-instructor-communities.ptx @@ -24,7 +24,7 @@

  • - Fork the upstream `GitKit-FarmData2` repository into their own GitHub space. + Fork the upstream of the GitKit FarmData2 repository into their own GitHub space.

  • @@ -34,7 +34,7 @@

  • - Clone their fork (i.e. their origin) of the `GitKit-FarmData2` repository. + Clone their fork (i.e. their origin) of the GitKit FarmData2 repository.

    • @@ -146,7 +146,7 @@ The slides conclude with a short introduction to the idea of an issue tracker and its role in a project. The use of the issue tracker tends to be fairly intuitive and the hands-on activities walk students through some of the details. The hands-on activity has each student claim an issue that is labeled as "Round 1." Note that they claim the issue in this activity, but do not fix it until the next activity. Each of these issues asks them to fix a typo that appears in one of the Markdown (.md) files in the root directory of the project.

    - If time permits, a live demo looking at the issue tracker in the upstream GitKit-FarmData2 repository, pointing out the "Round 1" label and how to tell if an issue has been assigned. Note that several of the issues will have been pre-assigned to whomever deployed the kit. + If time permits, a live demo looking at the issue tracker in the upstream GitKit FarmData2 repository, pointing out the "Round 1" label and how to tell if an issue has been assigned. Note that several of the issues will have been pre-assigned to whomever deployed the kit.

    @@ -179,7 +179,7 @@

    - Some students will give the URL of the upstream GitKit-FarmData2 repository for the course instead of their origin repository. A few may even give the URL of a real FarmData2 upstream repository. + Some students will give the URL of the upstream GitKit FarmData2 repository for the course instead of their origin repository. A few may even give the URL of a real FarmData2 upstream repository.

  • @@ -189,7 +189,7 @@

    - Some students will try to clone the upstream GitKit-FarmData2 repository for the course or even give the URL of a real FarmData2 upstream repository. + Some students will try to clone the upstream GitKit FarmData2 repository for the course or even give the URL of a real FarmData2 upstream repository.

  • @@ -219,7 +219,7 @@

    - Some students will attempt to clone the project that they select while they are inside the GitKit-FarmData2 repository that they already cloned. If they do attempt this the Kit-tty should intervene, prevent the action and respond with a helpful message. + Some students will attempt to clone the project that they select while they are inside the directory containing their local GitKit FarmData2 repository. If they do attempt this the Kit-tty should intervene, prevent the action and respond with a helpful message.

    • diff --git a/source/ch-instructor-guide/sec-instructor-synchronization.ptx b/source/ch-instructor-guide/sec-instructor-synchronization.ptx index cc95e36..68ed505 100644 --- a/source/ch-instructor-guide/sec-instructor-synchronization.ptx +++ b/source/ch-instructor-guide/sec-instructor-synchronization.ptx @@ -198,7 +198,7 @@

    - It is a good idea to check here that the student's upstream remote points to the correct GitKit-FarmData2 repository. The Kit-tty should have caught this error and directed students on the correct way to set the upstream remote. However, some students have still managed to set their upstream to point to their origin or to the live FarmData2 repository. + It is a good idea to check here that the student's upstream remote points to the correct GitKit FarmData2 repository. The Kit-tty should have caught this error and directed students on the correct way to set the upstream remote. However, some students have still managed to set their upstream to point to their origin or to the live FarmData2 repository.

  • diff --git a/source/ch-instructor-guide/sec-instructor-upstreaming.ptx b/source/ch-instructor-guide/sec-instructor-upstreaming.ptx index da8a6db..10efffe 100644 --- a/source/ch-instructor-guide/sec-instructor-upstreaming.ptx +++ b/source/ch-instructor-guide/sec-instructor-upstreaming.ptx @@ -7,7 +7,7 @@ Working Locally and Upstreaming Changes Instructor Notes

    - This chapter focuses on the upstreaming process. Students learn about feature branches, staging and committing changes, pushing feature branches to their origin repository, and making a pull request. At the end of the hands-on activity each student will have experienced the full forking workflow, resulting in a pull request to the upstream GitKit-FarmData2 repository for changes that fix the "Round 1" issue that they were assigned. The "Round 1" issues have been created such that they do not conflict with each other. Thus, all of the student pull requests should be able to be merged automatically. The instructor will typically perform these merges as a demonstration at the start of the class introducing . + This chapter focuses on the upstreaming process. Students learn about feature branches, staging and committing changes, pushing feature branches to their origin repository, and making a pull request. At the end of the hands-on activity each student will have experienced the full forking workflow, resulting in a pull request to the upstream GitKit FarmData2 repository for changes that fix the "Round 1" issue that they were assigned. The "Round 1" issues have been created such that they do not conflict with each other. Thus, all of the student pull requests should be able to be merged automatically. The instructor will typically perform these merges as a demonstration at the start of the class introducing .

    The exercises in this chapter have the students perform the following major tasks: diff --git a/source/ch-staying-synchronized/sec-appendix-a.ptx b/source/ch-staying-synchronized/sec-appendix-a.ptx index 1649a08..b857532 100644 --- a/source/ch-staying-synchronized/sec-appendix-a.ptx +++ b/source/ch-staying-synchronized/sec-appendix-a.ptx @@ -16,7 +16,7 @@

    - Ensure that you are in the GitKit-FarmData2 directory then use the following commands: + Ensure that you are in the directory for your local clone of your GitKit FarmData2 repository then use the following commands:

    1. git switch main diff --git a/source/ch-upstreaming-changes/sec-exploring-your-local-repository.ptx b/source/ch-upstreaming-changes/sec-exploring-your-local-repository.ptx index e7cae19..8d77db2 100644 --- a/source/ch-upstreaming-changes/sec-exploring-your-local-repository.ptx +++ b/source/ch-upstreaming-changes/sec-exploring-your-local-repository.ptx @@ -151,8 +151,7 @@

      - Ensure that you are in your cloned repo (i.e. - the GitKit-FarmData2 directory is your working directory). + Ensure that you are in the directory containing your cloned GitKit FarmData2 repository (use the cd command if necessary). Then use the git log command from to display the information about the 4 most recent commits. (If you don't see all four recent commits, press "return" or "spacebar" to see more; when you are done, press "q" to quit.)

      @@ -509,7 +508,7 @@

      The git status command provides the current status of your local repository. - Use the git status command to see the current status of your local GitKit-FarmData2 repository. + Use the git status command to see the current status of your local GitKit FarmData2 repository.