Difference between git Pull and git Merge?

[mweaver]

well... this was slightly different...

Code:

[mweaver@merlin corebos]$ git config core.fileMode false

[mweaver@merlin corebos]$ git pull
Updating 36c9eb9..0c1402a
error: Your local changes to the following files would be overwritten by merge:
        config.template.php
        include/js/en_gb.lang.js
        include/js/hu_hu.lang.js
        include/language/en_gb.lang.php
        include/language/hu_hu.lang.php
        log4php.properties
        modules/Accounts/language/hu_hu.lang.php
        modules/Administration/language/hu_hu.lang.php
        modules/Calendar/language/hu_hu.lang.php
        modules/Campaigns/language/hu_hu.lang.php
        modules/ConfigEditor/language/en_gb.lang.php
        modules/ConfigEditor/language/hu_hu.lang.php
        modules/Contacts/language/hu_hu.lang.php
        modules/CronTasks/language/hu_hu.lang.php
        modules/CustomView/language/hu_hu.lang.php
        modules/Documents/language/hu_hu.lang.php
        modules/Emails/language/en_gb.lang.php
        modules/Emails/language/hu_hu.lang.php
        modules/FieldFormulas/language/hu_hu.lang.php
        modules/Help/language/hu_hu.lang.php
        modules/HelpDesk/language/hu_hu.lang.php
        modules/Home/language/hu_hu.lang.php
        modules/Import/language/hu_hu.lang.php
        modules/Invoice/language/hu_hu.lang.php
        modules/Leads/language/hu_hu.lang.php
        modules/MailManager/language/hu_hu.lang.php
        modules/Migration/language/hu_hu.lang.php
        modules/Mobile/language/de_de.lang.php
        modules/Mobile/language/en_gb.lang.php
        modules/Mobile/language/hu_hu.lang.php
        modules/Mobile/language/nl_nl.lang.php
        modules/ModComments/language/hu_hu.lang.php
        modules/PBXManager/language/hu_hu.lang.php
        modules/Portal/language/hu_hu.lang.php
        modules/Potentials/language/hu_hu.lang.php
        modules/Products/language/hu_hu.lang.php
        modules/Project/language/de_de.lang.php
        modules/Project/language/es_es.lang.php
        modules/Project/language/hu_hu.lang.php
        modules/Project/language/nl_nl.lang.php
        modules/ProjectMilestone/language/de_de.lang.php
        modules/ProjectMilestone/language/es_es.lang.php
        modules/ProjectMilestone/language/hu_hu.lang.php
        modules/ProjectTask/language/de_de.lang.php
        modules/ProjectTask/language/es_es.lang.php
        modules/ProjectTask/language/fr_fr.lang.php
        modules/ProjectTask/language/hu_hu.lang.php
        modules/RecycleBin/language/hu_hu.lang.js
        modules/RecycleBin/language/hu_hu.lang.php
        modules/Reports/language/en_gb.lang.php
        modules/Reports/language/hu_hu.lang.php
        modules/Rss/language/hu_hu.lang.php
        modules/SMSNotifier/language/hu_hu.lang.php
        modules/SalesOrder/language/hu_hu.lang.php
        modules/ServiceContracts/language/hu_hu.lang.php
        modules/Services/language/hu_hu.lang.php
        modules/Settings/language/en_gb.lang.php
        modules/Settings/language/hu_hu.lang.php
        modules/System/language/hu_hu.lang.php
        modules/Tooltip/language/hu_hu.lang.php
        modules/Users/language/en_gb.lang.php
        modules/Users/language/hu_hu.lang.php
        modules/Utilities/language/hu_hu.lang.php
        modules/Vendors/language/hu_hu.lang.php
        modules/VtigerBackup/language/hu_hu.lang.php
        modules/WSAPP/language/hu_hu.lang.php
        modules/Webforms/language/en_gb.lang.php
        modules/Webforms/language/hu_hu.lang.php
        modules/Yahoo/language/hu_hu.lang.php
        modules/cbupdater/schema.xml
        modules/com_vtiger_workflow/language/en_gb.lang.php
        modules/com_vtiger_workflow/language/hu_hu.lang.php
        themes/alphagrey/style.css
        themes/woodspice/style.css
Please, commit your changes or stash them before you can merge.
Aborting