diff --git a/source/ch-staying-synchronized/sec-lets-do-it-again.ptx b/source/ch-staying-synchronized/sec-lets-do-it-again.ptx index 1ccc8ff..487cd4e 100644 --- a/source/ch-staying-synchronized/sec-lets-do-it-again.ptx +++ b/source/ch-staying-synchronized/sec-lets-do-it-again.ptx @@ -170,7 +170,7 @@

Pick one of the “Round2” issues to work on and make a comment on it to indicate your interest in working on it. - Note it is not necessary that the issue be assigned to you this time. + Note it is not necessary that the issue be assigned to you this time as it was in Round1. Try to spread out across the issues so that multiple people have commented that they are working on each one.

@@ -274,7 +274,7 @@

- When creating branches you should always use name that describes what is being done in the branch, without being too long. This will help you to remember the purpose of the branch, but not make it onerous to type. + When creating branches you should always use a name that describes what is being done in the branch, without being too long. This will help you to remember the purpose of the branch, but not make it onerous to type.

Which of the following would be the best name for a feature branch for issue #37 that adds a link to the NSF award in the Acknowledgements section? diff --git a/source/ch-staying-synchronized/sec-verifying-the-upstream-remote.ptx b/source/ch-staying-synchronized/sec-verifying-the-upstream-remote.ptx index 8a280da..cff9286 100644 --- a/source/ch-staying-synchronized/sec-verifying-the-upstream-remote.ptx +++ b/source/ch-staying-synchronized/sec-verifying-the-upstream-remote.ptx @@ -1,18 +1,18 @@

- Setting the Upstream Remote + The Upstream Remote

- Before you will be able to pull changes from the upstream you will need to tell your local repository where the upstream is. + Before you will be able to pull changes from the upstream your local repository will need to know where to find the upstream repository. In earlier figures (e.g. ), there were dotted orange lines indicating that your local repository knew about your origin and that your origin knew about the upstream. - However, there was no orange dotted line from your local repository to the upstream. That is because, by default, your local repository isn’t aware of the upstream. + However, there was no orange dotted line from your local repository to the upstream. That is because, by default, your local repository does not know the location of the upstream repository.

- In a dotted orange line was added pointing from your local repository to the upstream. Git will need this information so that it can pull changes from the upstream into your local repository. In this section, you will be adding this information by setting the upstream remote. + In a dotted orange line was added pointing from your local repository to the upstream. Git needs to have this information so that it can pull changes from the upstream into your local repository. In this section, you will see that the upstream remote provides this information.

- + git @@ -73,14 +73,14 @@

- Examine the output of the git remote -v command from . You should see two lines labeled origin (fetch and pull), that both show the same URL. + Examine the output of the git remote -v command. You should see two lines labeled origin (fetch and push), and two lines labeled upstream (also fetch and push).

- Where does the URL for the origin remote point? + Where does the URL associated with the origin remote point?

@@ -123,205 +123,137 @@

- Look at the part of the origin remote's URL that comes after `github.com`. This part indicates where on GitHub the repository is located. Is it in your GitHub space? + Look at the part of the origin remote's URL that comes after `github.com`. This part indicates where on GitHub the repository is located.

- +

- What in represents the origin Git remote that is associated with your local repository? + Where does the URL associated with the upstream remote point?

- The dotted orange arrow on the left that points from your local repository to the origin. + It points to the GitKit FarmData2 repository that your instructor created for the course.

- Correct. + The repository that your instructor create is serving as the upstream repository.

- The dotted orange arrow at the top that points from your origin repository to the upstream. + It points to your copy of the GitKit FarmData2 repository that you forked from the upstream.

- The arrow at the top represents a Git remote associated with your origin repository, not your local repository. + Correct! The origin is your fork that is contained in your GitHub space.

- The blue cylinder at the top left of the figure. + It points to the repository for the live FarmData2 project.

- The blue cylinders represent remote repositories. This question is asking about the Git remote. + That repository would be the upstream if you were working on the live project.

- Look at the diagram again. The origin Git remote will be associated with your local repo and will indicate where the origin repository is located. + Look at the part of the origin remote's URL that comes after `github.com`. This part indicates where on GitHub the repository is located.

- - - - Adding the Upstream Remote - - -

- Notice that the output from the git remote -v command did not include the location of the upstream repository. Thus, before you will be able to pull changes from the upstream into your local repository you will need to set the upstream remote. This will tell Git where the upstream repository is located. -

-

- The exercises in this section will walk you through the process of setting the upstream remote. -

- - - - - <exercise xml:id="ex-getting-upstream-url" label="ex-getting-upstream-url"> - <statement> - <p> - Use your browser to navigate to the GitHub page for the <em>upstream Gitkit FarmData2 repo</em> that you are using for this course. Hint: You can find the GitHub page for the upstream using the "forked from:" link at the top of the GitHub page for your origin repository. - </p> - <p> - Once you find the GitHub page for the upstream, you can get its URL by clicking the “Code” button and using the "Local" tab. This URL will end in <c>.git</c>. - </p> - <p> - Enter the URL of the upstream GitKit FarmData2 you are using for your course below. - </p> - <p> - <var width="45" /> - </p> - </statement> - <setup> - <var> - <condition string="^https://github\.com/(?!(FarmData2|DickinsonCollege)).+/.+\.git$"> - <feedback> - <p> - Looks good! But just to be sure, double check that this URL agrees with the one you gave in <xref ref="ex-upstream-url" />. - </p> - </feedback> - </condition> - <condition string=".*"> - <feedback> - <p> - Be sure you are copying the URL of the upstream for your class as given by your instructor. - </p> - </feedback> - </condition> - </var> - </setup> - </exercise> + <exercise xml:id="ex-remotes-in-figure" label="ex-remotes-in-figure"> + <introduction> + <p> + The remotes you just examined with <c>git remote -v</c> are also represented in <xref ref="fig-synching-with-upstream" />. + </p> + </introduction> - <exercise xml:id="ex-setting-upstream-remote" label="ex-setting-upstream-remote"> - <statement> - <p> - The <c>git remote</c> command you used to display the Git remotes is also used to add a new Git remote. - </p> - <p> - The format for this command is: <c>git remote add <name> <URL></c> - </p> - <p> - Give a command that will create a new Git remote named <em>upstream</em> that points to the <em>GitKit FarmData2 upstream repository</em> that you are using for this course. - </p> - <p> - <var width="65" /> - </p> - </statement> - <setup> - <var> - <condition string="^git remote add upstream https://github\.com/(?!(FarmData2|DickinsonCollege)).+/.+\.git$"> - <feedback> + <task xml:id="ex-origin-in-figure" label="ex-origin-in-figure"> + <statement> + <p> + How is the origin Git remote associated with your local repository represented in the figure? + </p> + </statement> + <choices randomize="yes"> + <choice correct="yes"> + <statement> <p> - Looks good! But just to be sure, double check that the URL you used agrees with the one you gave in <xref ref="ex-getting-upstream-url" />. + The dotted orange arrow on the left that points from your local repository to the origin. </p> - </feedback> - </condition> - <condition string=".*"> + </statement> <feedback> <p> - Double check the format of your command and the URL that you are using. + Correct. </p> </feedback> - </condition> - </var> - </setup> - </exercise> - - <exercise xml:id="ex-checking-upstream-remote" label="ex-checking-upstream-remote"> - <statement> - <p> - Use the <c>git remote -v</c> command. - What do you see that confirms that you have successfully added the upstream Git remote? - </p> - </statement> - <choices> + </choice> <choice> <statement> <p> - Two lines beginning with origin and giving the URL of the upstream repository. + The dotted orange arrow at the top that points from your origin repository to the upstream. </p> </statement> <feedback> <p> - The lines beginning with <c>origin</c> are the origin remote and give the URL of your origin repository. + The arrow at the top represents a Git remote associated with your origin repository, not your local repository. </p> </feedback> </choice> - <choice correct="yes"> + <choice> <statement> <p> - Two lines beginning with upstream and giving the URL of the upstream repository. + The blue cylinder at the top left of the figure. </p> </statement> <feedback> <p> - Correct! The URL of the upstream is where you will be pulling changes from. + The blue cylinders represent remote repositories. This question is asking about the Git remote. </p> </feedback> </choice> <choice> <statement> - Neither of the above. + <p> + The blue cylinder at the top right of the figure. + </p> </statement> <feedback> <p> - One of the above answers is correct. + The blue cylinders represent remote repositories. This question is asking about the Git remote. </p> </feedback> </choice> </choices> <hint> <p> - Think about the different between origin vs. - upstream. + Look at the diagram again. The origin Git remote will be associated with your local repo and will indicate where the origin repository is located. </p> </hint> - </exercise> - + </task> - <exercise xml:id="ex-upstream-in-figure" label="ex-upstream-in-figure"> + <task xml:id="ex-upstream-in-figure" label="ex-upstream-in-figure"> <statement> <p> - You just added the upstream Git remote to your local repository. How is this Git remote represented in <xref ref="fig-synching-with-upstream" />? + How is the upstream Git remote represented associated with your local repo represented in the figure? </p> </statement> <choices randomize="yes"> @@ -361,6 +293,18 @@ </p> </feedback> </choice> + <choice> + <statement> + <p> + The blue cylinder at the top left of the figure. + </p> + </statement> + <feedback> + <p> + The blue cylinders represent remote repositories. This question is asking about the Git remote. + </p> + </feedback> + </choice> <choice> <statement> <p> @@ -379,12 +323,74 @@ Look at the diagram again. The upstream Git remote will be associated with your local repo and will indicate where the upstream repository is located. </p> </hint> + </task> </exercise> </exercises> + </subsection> + + <subsection xml:id="topic-setting-the-upstream" label="topic-setting-the-upstream"> + <title>Adding an Upstream Remote + + +

+ As you saw in your local repository contains an upstream remote that points to the upstream being used for your course. This upstream was set automatically by the development environment when you opened your local repository. +

+

+ Not all development environments are able to automatically set the upstream remote when you open your local repository. The exercises in this section will walk you through how you can manually set the upstream remote if you need to. +

+ + + + + + + +

+ The git remote command you used to display the Git remotes is also used to add new Git remotes. +

+

+ The format for this command is: git remote add <name> <URL> +

+

+ Give a command that will create a new Git remote named upstream that points to the GitKit FarmData2 upstream repository that you are using for this course. +

+

+ +

+ + + + + +

+ Looks good! But just to be sure, double check that the URL you used agrees with the one you gave in . +

+ + + + +

+ Double check the format of your command and the URL that you are using. +

+ + + + + +

+ The URL of the upstream for your class was given by your instructor and should be in . +

+ + + + + +

+ Note that if you are using a development environment that does not automatically set the upstream remote for you, you will still only need to set it once. Once the upstream remote is set for a repository you will be able to pull from the upstream repo as often as is necessary. +

- Note that you will only need to set the upstream remote once for a repository. - Once the upstream remote is set you will be able to pull from the upstream repo as often as is necessary. + It is also worth mention that there is nothing particularly special about the names of the remotes. The names origin and upstream are used by convention by most developers. However, you could name your remotes anything you like and they would still work.