Git

How to Resolve Git merge conflicts during a pull?

To resolve all conflicts with below simple steps.

git fetch && git reset --hard origin/master

git pull -X theirs

git pull origin master

Could not reach Instagram server