"Push" "Pull" problems

[dkanos14]

Good day,

I made changes to my code, and I am trying to change it and push it however it generates these errors that said I would need to "pull" from GitHub before pushing it back. I tried to do that, and it came back with this error.

"error: Your local changes to the following files would be overwritten by merge:
README.md"

Could you please advise?

[deblnia]

You appear to have a merge conflict. Pulling from the website, "merge conflicts occur when there are differences between merged files." This is a good starting point to resolve it, but be sure to use the terminal tab and not the R console.

[deblnia]

If you don't want to bother with that, the brute force way to resolve this would be to:

1. Copy all the content in your README somewhere else temporarily (maybe a word doc)
2. Delete your local README
3. Pull the README Github sees to your local machine (just a simple pull)
4. Copy the text you put aside in step 1 into this README