git pull master to branch code example

Example 1: git merge origin/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

Example 2: 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		# pull master into <branch-name>

Example 3: 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)

Example 4: pull from master to local

git pull origin master:master