how to update develop branch from master code example

Example 1: 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 2: git update branch from master

git checkout test-branch 	//Checkout the branch you want to update
git merge master			//Merge all code from master to test-branch

// When your are done with test-branch you can merge all code into master branch
git checkout master 		// Make sure you are on master branch
git merge test-branch

Example 3: git how to update branch from master

git fetch
git rebase origin/master

Example 4: 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

Example 5: update branch with master

MERGE METHOD: (keeps branch history accurate)
git checkout b1
git merge origin/master
git push origin b1

REBASE METHOD: (history will appear linear, will conflict if already pushed)
git checkout b1
git rebase master