How to solve git pull error and conflict?

Question

git

There is a branch in the repository. I did a git pull from it to my computer. Made changes locally. At this time, another person made his changes and did a git push to the same branch.
As a result, I made a commit (git commit) and am trying to do a git push. But it doesn't work for me, git asks me to do a git pull first. At the same time, git pull also fails.
How to resolve this conflict? I need to make changes to a branch

Answer 1

When you did a git pull you had uncommitted changes. You need to resolve conflicts and make a commit. After that, you can safely do a push. Nobody will solve the conflict for you, you need to look at the code and choose whose changes to leave or leave everything.

Answer 2

First you commit the changes, then you merge the code from the repository and push