What is the best approach for merge conflicts?

I assume people pulls everything from master, then suddenly merge conflicts.
master --> feature/my-branch

git pull origin master
(Go through everyfile and fix merge conflicts?)
git add ./git add --all
git commit -m "merge conflicts"
git push