What are the actions in the event of a conflict?

Question

git

When pushing, if you see a conflict, then what are your actions, you first make a pool without looking, or do you still go to github to read what changes have occurred there, if possible, point by point:
0) git push
1) conflict
2) ...

Answer 1

https://habr.com/post/323234/