CODE EXAMPLE FOR SHELL

pull from dev branch to master

(on branch development)$ git merge master
(resolve any merge conflicts if there are any)
git checkout master
git merge development (there won't be any conflicts now)