merge local branch to develop code example

Example 1: merge develop to branch

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

Example 2: git merge local branch

// checkout the branch to merge INTO
git checkout master
// merge local feature branch into master branch
git merge feature_branch_name