Difference between git Pull and git Merge?

[mweaver]

(03-05-2017, 12:39 AM)joebordes Wrote: Ok, that was not a good example, that file shows you have made changes there. you do not need to change this file so you can "git checkout config.template.php"
now show me

git status include/language/hu_hu.lang.php

[mweaver@merlin corebos]$ git status include/language/hu_hu.lang.php

# On branch master
# Your branch is behind 'origin/master' by 3343 commits, and can be fast-forwarded.
#   (use "git pull" to update your local branch)
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   include/language/hu_hu.lang.php
#
no changes added to commit (use "git add" and/or "git commit -a")