Change the dev branch to become the master branch

http://stackoverflow.com/a/2763118/691530

# Go to your dev_branch
git checkout dev_branch

# Merge the master to the dev_branch
git merge --strategy=ours master

# Go to the master
git checkout master

# Merge the dev_branch to the master
git merge dev_branch