1. Update your master branch:
git checkout master
git pull --rebase origin master
2. Merge changes from Master to feature branch
git checkout [feature branch name]
git merge --no-ff master
3. Check if your changes has been included (Optional)
git log