how to do git merge from dev to feature branch code example

Example 1: merge develop to branch

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

Example 2: merge master into local branch

git checkout feature1
git merge master