git merge develop into my branch code example

Example 1: merge develop to branch

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

Example 2: 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.