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: Merge Conflicts
This lesson is locked
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
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?
David Keyes
October 7, 2022
It's likely you still have a merge conflict somewhere that you haven't yet dealt with. Take a look all the way to the bottom of your file and let me know if you see anything!
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.
Dorothy Q Kellogg
March 28, 2023
Same thing again. It still has the yellow boxes to the left of the file. When I made the edit, I made it in RStudio and saved. I wonder if something is different in how GitHub is dealing with merge conflicts. Here is the error message.
error: Committing is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. U README.md
Dorothy Q Kellogg
March 28, 2023
Flaky. I tried clicking the staged button a couple times, then it finally made the box to the left blue, and I could commit.
David Keyes
March 29, 2023
Sounds like you figure it out, which is great! If you still need any help, just reply here.