git checkout development git merge -s ours master git checkout master git merge development
(-s ours is short for --strategy=ours)