Shopping Cart

No products in the cart.

Back to Course

Using Git and GitHub with R

0% Complete
0/0 Steps
  1. Welcome, Logistics, Course Materials, and Additional Resources
  2. Introduction to Git and GitHub
    What is Git? What is GitHub?
  3. Why Should You Learn to Use Git and GitHub?
  4. Update Everything
  5. Git
    Install Git
  6. Configure Git
  7. Create a Local Git Repository
  8. Commits
  9. Commit History
  10. GitHub
    GitHub Repositories
  11. Connect RStudio and GitHub
  12. Push an RStudio Project to a GitHub Repository
  13. Pull a GitHub Repository to an RStudio Project
  14. Keep RStudio and GitHub in Sync
  15. Collaborating with Git and GitHub
    Why Use GitHub vs Dropbox, Google Drive, Box, etc?
  16. Dealing with Common Problems: Can't Pull Code from GitHub
  17. Dealing with Common Problems: Merge Conflicts
  18. Dealing with Common Problems: Can't Push Code to GitHub
  19. Let's Keep Bad Things from Happening in the First Place
  20. Branches
    What are Branches and Why Should We Use Them?
  21. Branch Names
  22. How to Create Branches
  23. Using Pull Requests to Merge a Branch Into Main
  24. Project Management with GitHub
    GitHub Issues
  25. How to Organize Issues
  26. Wrapping Up
    Other Cool Stuff You Can Do with GitHub
Using Git and GitHub with R Dealing with Common Problems: Merge Conflicts
Lesson 17 of 26
In Progress

Dealing with Common Problems: Merge Conflicts

Your Turn

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

  1. 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
  2. Edit the README.md 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!

  1. Jessica Brewer October 6, 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?

    1. 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!