Skip to content

Using Git and GitHub with R

Merge Conflicts

This lesson is called Merge Conflicts, part of the Using Git and GitHub with R course. This lesson is called Merge Conflicts, 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.

Learn More

If you are scared of merge conflicts and want to get over that fear, check out Meghan Harris's talk Please Let Me Merge Before I Start Crying.

Have any questions? Put them below and we will help you out!

You need to be signed-in to comment on this post. Login.

Course Content

28 Lessons

Welcome to Using Git and GitHub with R

How the Course Works

Update Everything

Create a Local Git Repository

GitHub Repositories

Connect to GitHub

Publish Repository from Local to Remote

Clone Repository from Remote to Local

Keep Local and Remote Repositories in Sync

Why Use GitHub for Collaboration?

Set up GitHub Repositories for Collaboration

Project Management with GitHub

Can't Pull Code from GitHub

Merge Conflicts

Can't Push Code to GitHub

Use gitignore to Keep Files Off of GitHub

Best Practices for Using Git and GitHub

How to Work on Multiple Computers with Git and GitHub

How to Avoid Putting Sensitive Information on GitHub

Continuous Deployment

Use GitHub Actions to Run Code Automatically

Wrapping up Using Git and GitHub with R