title: Git: set master identical to develop
body: <p>I cannot get my master and develop branches to be identical. I want my master branch to look exactly like my develop branch as it currently exists, but somehow despite file name changes and deletion of directories in develop, those filenames and directories still exist in master no matter a merge, which just tells me that everything is up to date so I'm stuck as to how to get master to change without doing it manually, which is sure to be error prone.</p>