git pull and merge from another branch code example
Example: in a new branch should i pull before merge
git checkout master
git pull origin master
git merge test
git push origin master
git checkout master
git pull origin master
git merge test
git push origin master