Resolving git merge conflict before they happen

Sometimes you just want to merge code from git and not have to worry about fixing merge issues. To do this there are many ways. Here’s a few:

git stash
git pull origin master
git stash apply

git reset --hard
git pull origin master