Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add git_remotes folder and contents #95

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Add git_remotes folder and contents #95

wants to merge 16 commits into from

Conversation

pakstisj
Copy link

@pakstisj pakstisj commented Apr 8, 2022

No description provided.


We’ll discuss remotes in more detail in the next episode, while talking about how they might be used for collaboration.

### SSH
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

$ 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:
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@pakstisj pakstisj mentioned this pull request 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.
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Example to show what intervening changes and pulling would look like?


**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.
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Link to conflicts module when it's complete.


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">
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirm with someone else? Definitely true for me but not sure if universal

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant