Difference between git Pull and git Merge?

[mweaver]

Firstly, it's become painfully clear that the reason my code and data is so out of date is because I didn't understand that "I" was responsible to taking certain steps to occasionally run the necessary git commands to sync the code on my server and then apply updates. My fault entirely.

So now, I find myself wanting to get my installation of CoreBOS completely up-to-date. I've been fighting with migrating my installation to a new server - the current code-base runs fine on the new server however I really do need to get this critter up to date.

I'm wondering what the difference in git pull and git merge is.

When I run git pull on my current installation I receive the following information on the console:

Code:

[mweaver@mail corebos]$ git pull

remote: Counting objects: 36600, done.
remote: Compressing objects: 100% (483/483), done.
remote: Total 36600 (delta 11577), reused 11346 (delta 11346), pack-reused 24771
Receiving objects: 100% (36600/36600), 21.71 MiB | 13 KiB/s, done.
Resolving deltas: 100% (26328/26328), completed with 1957 local objects.
From https://github.com/tsolucio/corebos
   17277d5..0c1402a  master     -> origin/master
 * [new branch]      aggwidget  -> origin/aggwidget
 * [new branch]      new_mobile_version -> origin/new_mobile_version
Updating 36c9eb9..0c1402a
error: Your local changes to the following files would be overwritten by merge:
        .gitignore
        Copyright.txt
        PEAR.php
        Popup.php
        Smarty/templates/AccountHierarchy.tpl
        Smarty/templates/ActivityReminderCallback.tpl
        Smarty/templates/AddMailAccount.tpl
        Smarty/templates/AddProductToPriceBooks.tpl
        Smarty/templates/AddProductsToPriceBook.tpl
        Smarty/templates/AdvanceFilter.tpl
        Smarty/templates/AuditTrailList.tpl
        Smarty/templates/Buttons_List.tpl
        Smarty/templates/Calculator.tpl
        Smarty/templates/Clock.tpl
        Smarty/templates/ComposeEmail.tpl
        Smarty/templates/CreateEmailTemplate.tpl
        Smarty/templates/CreateView.tpl
        Smarty/templates/CreateWordTemplate.tpl
        Smarty/templates/CurrencyDetailView.tpl
        Smarty/templates/CurrencyEditView.tpl
        Smarty/templates/CurrencyListView.tpl
        Smarty/templates/CurrencyListViewEntries.tpl
        Smarty/templates/CustomFieldMapping.tpl
        Smarty/templates/CustomView.tpl
        Smarty/templates/DefModuleView.tpl
        Smarty/templates/DetailViewEmailTemplate.tpl
        Smarty/templates/DetailViewFields.tpl
        Smarty/templates/DetailViewHidden.tpl
        Smarty/templates/DetailViewUI.tpl
        Smarty/templates/DisplayFields.tpl
        Smarty/templates/DocumentsListView.tpl
        Smarty/templates/DocumentsListViewEntries.tpl
        Smarty/templates/EditProfile.tpl
        Smarty/templates/EditViewHidden.tpl
        Smarty/templates/EditViewUI.tpl
        Smarty/templates/EmailDetailView.tpl
        Smarty/templates/EmailDetails.tpl
        Smarty/templates/Emails.tpl
        Smarty/templates/ExportRecords.tpl
        Smarty/templates/FieldAccessindex.tpl
        Smarty/templates/FieldOrderindex.tpl
        Smarty/templates/FindDuplicateAjax.tpl
        Smarty/templates/FindDuplicateDisplay.tpl
        Smarty/templates/GroupDetailview.tpl
        Smarty/templates/GroupEditView.tpl
        Smarty/templates/Header.tpl
        Smarty/templates/Home/HomeBlock.tpl
        Smarty/templates/Home/HomeButtons.tpl
        Smarty/templates/Home/Homestuff.tpl
        Smarty/templates/Home/MainHomeBlock.tpl
        Smarty/templates/HomeNews.tpl
        Smarty/templates/ImportStep1.tpl
        Smarty/templates/ImportStep2.tpl
        Smarty/templates/Inventory/ProductDetails.tpl
        Smarty/templates/JsArray.tpl
        Smarty/templates/ListEmailTemplates.tpl
        Smarty/templates/ListGroup.tpl
        Smarty/templates/ListLeadCustomFieldMapping.tpl
        Smarty/templates/ListLoginHistory.tpl
        Smarty/templates/ListRoles.tpl
        Smarty/templates/ListViewButtons.tpl
        Smarty/templates/ListViewEntries.tpl
        Smarty/templates/ListWordTemplates.tpl
        Smarty/templates/Login.tpl
        Smarty/templates/LoginFooter.tpl
        Smarty/templates/LoginHeader.tpl
        Smarty/templates/MailScanner/MailScannerEdit.tpl
        Smarty/templates/MailScanner/MailScannerFolder.tpl
        Smarty/templates/MailScanner/MailScannerInfo.tpl
        Smarty/templates/MailScanner/MailScannerRule.tpl
        Smarty/templates/MailScanner/MailScannerRuleEdit.tpl
        Smarty/templates/MailerExport.tpl
        Smarty/templates/MassEditForm.tpl
        Smarty/templates/MergeColumns.tpl
        Smarty/templates/MergeFields.tpl
        Smarty/templates/MySitesContents.tpl
        Smarty/templates/Organizationindex.tpl
        Smarty/templates/Popup.tpl
        Smarty/templates/PopupContents.tpl
        Smarty/templates/PrintEmail.tpl
        Smarty/templates/PrintReport.tpl
        Smarty/templates/ProfileDetailView.tpl
        Smarty/templates/QuickCreate.tpl
        Smarty/templates/QuickCreateHidden.tpl
        Smarty/templates/RelatedListContents.tpl
        Smarty/templates/RelatedListDataContents.tpl
        Smarty/templates/RelatedListNew.tpl
        Smarty/templates/RelatedListsHidden.tpl
        Smarty/templates/ReportColumns.tpl
        Smarty/templates/ReportColumnsTotal.tpl
        Smarty/templates/ReportDashbord.tpl
        Smarty/templates/ReportFilters.tpl
        Smarty/templates/ReportGrouping.tpl
        Smarty/templates/ReportRunContents.tpl
        Smarty/templates/ReportSharing.tpl
        Smarty/templates/Reports.tpl
        Smarty/templates/ReportsCustomize.tpl
        Smarty/templates/ReportsScheduleEmail.tpl
        Smarty/templates/ReportsStep0.tpl
        Smarty/templates/ReportsStep1.tpl
        Smarty/templates/ReportsType.tpl
        Smarty/templates/RoleEditView.tpl
        Smarty/templates/RolePopup.tpl
        Smarty/templates/RoleTree.tpl
        Smarty/templates/Rss.tpl
        Smarty/templates/SelectEmail.tpl
        Smarty/templates/SentMailFolders.tpl
        Smarty/templates/SetMenu.tpl
        Smarty/templates/Settings.tpl
        Smarty/templates/Settin
Aborting

I can guarantee I haven't changed any of these files if that is what is stopping the process from completing successfully. I have to admit that there is a lot about this process that clearly I don't understand... yet. I really want to understand this. I'm also aware of the fact that because I've not paid the proper attention to keeping my code up to date the database has suffered because it appears to be in a state where I might be stuck at this code level.

Another question i have is: Can I combine the git commands like this:

Code:

git pull merge

 
in order to force the process to merge the new files into the existing system? I haven't tried it yet because I don't understand enough about how git works.

Joe: I've been really frustrated the past week or so and its mostly due to the fact that I've taken on too much at one time while trying to keep up with my regular work-load. So, I think I'll just concentrate on this one thing here. Your help and guidance is much appreciated.