Conversation
pakstisj
commented
Apr 8, 2022
|
|
||
| We’ll discuss remotes in more detail in the next episode, while talking about how they might be used for collaboration. | ||
|
|
||
| ### SSH |
Author
There was a problem hiding this comment.
Should SSH become its own module that can then be a prereq here? It just seems like a pretty lengthy detour from the main content of the module.
pakstisj
commented
Apr 8, 2022
| $ git init | ||
| ``` | ||
|
|
||
| If you remember back to the earlier episode where we added and committed our earlier work on mars.txt, we had a diagram of the local repository which looked like this: |
Author
There was a problem hiding this comment.
Should I remove these SWC diagrams since they weren't used before? I could replace with a text description harkening back to the language ED used in the Understanding the git workflow module
Closed
Make push and pull own pages
pakstisj
commented
Apr 8, 2022
| Already up-to-date. | ||
| ``` | ||
|
|
||
| Pulling has no effect in this case because the two repositories are already synchronized. If someone else had pushed some changes to the repository on GitHub, though, this command would download them to our local repository. |
Author
There was a problem hiding this comment.
Example to show what intervening changes and pulling would look like?
pakstisj
commented
Apr 8, 2022
|
|
||
| **Pulling** remote changes into your local repository means you are getting any changes pushed to the remote repository and using the files in that state to perform add your own changes. | ||
|
|
||
| Remebering to push and pull changes is especially important when collaborating with others. Others cannot see or work with your changes if you do not push them. You may be working from an outdated version of your repository if you do not pull changes prior to starting out. Forgetting one or both of these steps may lead to conflicts in Git. |
Author
There was a problem hiding this comment.
Link to conflicts module when it's complete.
pakstisj
commented
Apr 8, 2022
|
|
||
| What we will do now is the minimum required to set up the SSH keys and add the public key to a GitHub account. | ||
|
|
||
| <div class = "warning"> |
Author
There was a problem hiding this comment.
Confirm with someone else? Definitely true for me but not sure if universal
add Attribution section with our own CC license HTML
Attribution>Addt'l Resources and add @source_attribution there
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.