SHELL

git pull master into branch

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>

pull master into branch

git checkout dmgr2      # gets you "on branch dmgr2"
git fetch origin        # gets you up to date with origin
git merge origin/master