xxxxxxxxxx
git pull
git merge origin/master
Pulls master doesn't effect it!
xxxxxxxxxx
git checkout <branch-name> # gets you on <branch-name>
git fetch origin # gets you up to date with origin
git merge origin/master # merge master into <branch-name>
xxxxxxxxxx
git checkout dmgr2 # gets you "on branch dmgr2"
git fetch origin # gets you up to date with origin
git merge origin/master
xxxxxxxxxx
(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)