merge branch into development code example

Example 1: merge master to dev branch

1. //pull the latest changes of current development branch if any        
git pull (current development branch)

2. //switch to master branch
git checkout master 

3. //pull all the changes if any
git pull

4. //Now merge development into master    
git merge development

5. //push the master branch
git push origin master

Example 2: merge develop to branch

git checkout develop 
git pull 
git checkout branch-x
git rebase develop

Example 3: git merge branch a to branch b

git checkout b				# b is checked out (b could be master for exampel)
git pull					# update local b
git merge a					# merge branch a into b
git push					# b changes on remote.