git push -f带来的conflict如何解决

[git checkout master
git pull]
----------------------------------------------------------------------------------------
git log
git reset --hard [sha] | git reset --hard origin/master
git pull origin [branch]
--------