merge local branch with remote code example

Example 1: how to merge remote branch

//make sure you're on the local branch, then:

git pull origin YourRemoteBranch

//which is the same as:

git fetch origin YourRemoteBranch
git merge origin/YourRemoteBranch

Example 2: merge master into local branch

git checkout feature1
git merge master