CODE EXAMPLE FOR SHELL

git merge develop to feature

git checkout dev
git pull 
git checkout feature_branch
git merge dev 
git mergetool (resolve conflicts)
git commit