Dealing with Common Problems: Merge Conflicts
This lesson is called Dealing with Common Problems: Merge Conflicts, part of the Using Git and GitHub with R course. This lesson is called Dealing with Common Problems: 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.
Your Turn
You should have a merge conflict in the README.md file because you edited it both in RStudio and on GitHub
Open up the README.md 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
Edit the README.md file to resolve the merge conflict
Commit (I usually use a message like “fix merge conflict”)
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.
Just putting some githugs* out into the world today 💜💚💛
— Allison Horst (@allison_horst) September 22, 2022
*the best typo ever from @juliesquid 🤗 pic.twitter.com/yjn8blP63M
Have any questions? Put them below and we will help you out!
Course Content
26 Lessons
You need to be signed-in to comment on this post. Login.
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 • March 28, 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.