check file permisisons before submitting
$ git checkout long-running-branch
$ git merge -s ours master
:wq
$ git checkout master
$ git merge long-running-branch
check file permisisons before submitting
$ git checkout long-running-branch
$ git merge -s ours master
:wq
$ git checkout master
$ git merge long-running-branch