Git pull vs Git Merge

 Git Pull vs Git Merge:

Note:While using git pull if you have files with same name in working directory.It may results in conflict you have to resolve the conflict which leads to an extra merge.Or else you can stash first working copy changes and pull code from remote and then pop or apply stashed changes and perform merging.The second approach reduces one extra commit as compared to merge. 

Syntaxes:

$git fetch

$git merge origin/master

$git pull origin master