How to resolve a conflict in git?

Question

git

The bottom line is, my friend and I made changes, as a result, our branches (I hope I said it right) became so different that when merging (the "get" button)
it gives an error. replaced it with my version

Answer 1

It would be necessary for a friend to completely erase everything that he did and replace it with my version

Assuming you're both working on the master branch and the friend's remote repository is origin, he can do this:

git fetch origin # -- получить содержимое удалённого репозитория origin, но не мёржить в текущую ветку.
git reset --hard origin/master # -- установить текущую ветку в состояние ветки master из удалённого репозитория origin.