If you are trying to merge a dev branch onto the master and get an error similar to the error below you might need to use rebase.
$ git merge dev
CONFLICT (content): Merge conflict in index.html
Automatic merge failed; fix conflicts and then commit the result.
If you are trying to make master look like your dev branch then you need to use rebase like this:
git checkout master
git rebase dev
git push origin master