I have seen two different ways of merging local branches.

git checkout master
git merge new_feature


git checkout master
git pull . new_feature

What is the difference, pros/cons?

Edit
Report