How to handle updated readme that I never pulled?

Question

I updated my readme.md using the GitHub interface and then made a number of local commits without ever pulling the changes made to the remote repository.

Now when I try to push the local changes I get an error:

Updates were rejected because the tip of your current branch is behind its remote counterpart. Integrate the remote changes (e.g. 'git pull ...') before pushing again.

Similarly, when I pull I get an error:

Automatic merge failed; fix conflicts and then commit the result.

What is the simplest way to handle this problem using Git?

I am having a hard time thinking of a title over here guys. If somebody can think of a better one please edit. — Caster Troy, Aug 09 '14 at 18:55

score 2 · Accepted Answer · edited May 23 '17 at 11:49

2

Resolve the conflicts using git mergetool, commit and push.

Read more about Merge Conflicts here: How to resolve merge conflicts in Git?

edited May 23 '17 at 11:49

Community

1
1

answered Aug 09 '14 at 18:57

Akshay Machhindra Mankar

185
7

I have know clue what IDE you are using, but your IDE might have a nice merge tool built in (e.g. IntelliJ IDEA) – jamesthollowell Aug 09 '14 at 20:24

How to handle updated readme that I never pulled?

1 Answers1