Push and pull from repository

Question

I am an apprentice, jajaja. I am trying to perform a pull/push origin master from my master branch and I have this problem, someone who knows how to help me or if I have to configure something?

Find the image here

Answer 1

git status at the end of your screenshot would have told you what to do. You have to resolve the merge conflict .

• Look into the files mentioned by git status , remove the conflict markers and fix the content.
• After that git add the files
• And git commit your merge
• now you should be able to git push