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
Using Pull Requests to Merge a Branch Into Main
This lesson is locked
This lesson is called Using Pull Requests to Merge a Branch Into Main, part of the Using Git and GitHub with R course. This lesson is called Using Pull Requests to Merge a Branch Into Main, part of the Using Git and GitHub with R course.
If the video is not playing correctly, you can watch it in a new window
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 the branch you created previously in your local-first project:
Submit a pull request on GitHub
Review your pull request
Merge your code back into the main branch
Confirm that everything worked
Learn More
To learn how to deal with merge conflicts that may come up when you do a pull request, check out this article from GitHub.
If you’re curious to see the original tweet thread where I learned about using pull requests, here it is!
Is there any way to merge branches with the Git tab in RStudio GUI? I know you can do it in the console, but trying to avoid that.
— David Keyes (@dgkeyes) October 19, 2021
If you're interested in an in-depth look at how to do code reviews, this guide from the team that makes the tidyverse is useful.
You need to be signed-in to comment on this post. Login.