# git checkout master
# git merge --no-ff release -X theirs