Get access to all lessons in this course.
-
Introduction to Git and GitHub
- What is Git? What is GitHub?
- Why Should You Learn to Use Git and GitHub?
- Update Everything
-
Git
- Install Git
- Configure Git
- Create a Local Git Repository
- Commits
- Commit History
-
GitHub
- GitHub Repositories
- Connect RStudio and GitHub
- Push an RStudio Project to a GitHub Repository
- Pull a GitHub Repository to an RStudio Project
- Keep RStudio and GitHub in Sync
-
Collaborating with Git and GitHub
- Why Use GitHub vs Dropbox, Google Drive, Box, etc?
- Dealing with Common Problems: Can't Pull Code from GitHub
- Dealing with Common Problems: Merge Conflicts
- Dealing with Common Problems: Can't Push Code to GitHub
- Let's Keep Bad Things from Happening in the First Place
-
Branches
- What are Branches and Why Should We Use Them?
- Branch Names
- How to Create Branches
- Using Pull Requests to Merge a Branch Into Main
-
Project Management with GitHub
- GitHub Issues
- How to Organize Issues
-
Wrapping Up
- Other Cool Stuff You Can Do with GitHub
Using Git and GitHub with R
Dealing with Common Problems: Can't Pull Code from GitHub
This lesson is locked
This lesson is called Dealing with Common Problems: Can't Pull Code from GitHub, part of the Using Git and GitHub with R course. This lesson is called Dealing with Common Problems: Can't Pull Code from GitHub, part of the Using Git and GitHub with R course.
Transcript
Click on the transcript to go to that point in the video. Please note that transcripts are auto generated and may contain minor inaccuracies.
Your Turn
Working in your
local-firstproject in RStudio, make an edit to your README.md file, but do not commit your changesGo to the
local-firstproject on GitHub, make a change to your README.md file and save it (this will automatically commit your changes)In RStudio, attempt to pull from GitHub, making sure you get the message about needing to commit your changes before pulling
Now commit your edits in the RStudio version of the
local-firstprojectPull again, making sure you can successfully bring in the changes from GitHub
Heads up: you should get a message about a merge conflict. We’ll deal with this in the next lesson!
You need to be signed-in to comment on this post. Login.