Skip to content
R for the Rest of Us Logo

Dealing with Common Problems: Merge Conflicts

This lesson is locked

Get access to all lessons in this course.

If the video is not playing correctly, you can watch it in a new window


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

You should have a merge conflict in the file because you edited it both in RStudio and on GitHub

  1. Open up the file and find the conflict markers, conflict divider, and identify which parts of the code come from the changes you made in RStudio and which come from the changes you made on GitHub

  2. Edit the file to resolve the merge conflict

  3. Commit (I usually use a message like “fix merge conflict”)

  4. Push your code to GitHub

Learn More

If you get a merge conflict and it makes you feel like you need a hug, Allison Horst has you covered.

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

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

Jessica Brewer

Jessica Brewer

October 7, 2022

When I delete the code I don't want from the merge conflict in the R script box in R Studio and try to commit it, I am getting the following message, "error: Committing is not possible because you have unmerged files.". How do I address this?

Dorothy Q Kellogg

Dorothy Q Kellogg

March 29, 2023

I got the same thing as Jessica. I tried reverting and am now told my branch is one commit ahead of the master/origin. I'm thinking I should just kill the RStudio project and start over.