05-08-2015, 04:15 PM
I was checking the threads on updates today and realized I still don't have a decent grasp on how this operates or how to use it properly. Below are the results of "git pull" on my system and I was wondering what they mean.
Code:
[mweaver@mail corebos]$ git pull
Updating 36c9eb9..6af60ce
error: Your local changes to the following files would be overwritten by merge:
.gitignore
Popup.php
Smarty/templates/AdvanceFilter.tpl
Smarty/templates/Buttons_List.tpl
Smarty/templates/ComposeEmail.tpl
Smarty/templates/CreateEmailTemplate.tpl
Smarty/templates/CustomFieldMapping.tpl
Smarty/templates/CustomView.tpl
Smarty/templates/DetailViewEmailTemplate.tpl
Smarty/templates/DetailViewUI.tpl
Smarty/templates/EditViewHidden.tpl
Smarty/templates/EditViewUI.tpl
Smarty/templates/EmailDetailView.tpl
Smarty/templates/Header.tpl
Smarty/templates/Inventory/ProductDetails.tpl
Smarty/templates/ListRoles.tpl
Smarty/templates/ListViewEntries.tpl
Smarty/templates/LoginHeader.tpl
Smarty/templates/MergeFields.tpl
Smarty/templates/Popup.tpl
Smarty/templates/PopupContents.tpl
Smarty/templates/QuickCreate.tpl
Smarty/templates/QuickCreateHidden.tpl
Smarty/templates/RelatedListContents.tpl
Smarty/templates/Settings/LayoutBlockEntries.tpl
Smarty/templates/Settings/ModuleManager/ModuleImportStep1.tpl
Smarty/templates/Settings/ModuleManager/ModuleManagerAjax.tpl
Smarty/templates/com_vtiger_workflow/EditTask.tpl
Smarty/templates/com_vtiger_workflow/EditWorkflowTriggerTypes.tpl
Smarty/templates/com_vtiger_workflow/ListWorkflows.tpl
Smarty/templates/com_vtiger_workflow/taskforms/VTCreateTodoTask.tpl
Smarty/templates/com_vtiger_workflow/taskforms/VTEntityMethodTask.tpl
Smarty/templates/modules/Calendar4You/Buttons_List.tpl
Smarty/templates/modules/Calendar4You/CalendarView.tpl
Smarty/templates/modules/Calendar4You/EventListView.tpl
Smarty/templates/modules/Calendar4You/Header.tpl
Smarty/templates/modules/MailManager/Relationship.tpl
Smarty/templates/modules/MailManager/index.tpl
Smarty/templates/modules/ModComments/widgets/DetailViewBlockComment.tpl
Smarty/templates/modules/PickList/AssignPicklistValues.tpl
Smarty/templates/modules/RecycleBin/RecycleBin.tpl
Smarty/templates/modules/RecycleBin/RecycleBinContents.tpl
Smarty/templates/modules/SMSNotifier/DetailView.tpl
Smarty/templates/modules/Vtiger/CustomFieldList.tpl
build/HelperScripts/composerinstallmodule.php
build/HelperScripts/evalwf.php
build/changeSets/cffaq.php
build/changeSets/cleanoptimizedatabase_140.php
build/changeSets/coreboscp_rest.php
build/migrate_from_vt6.php
cron/MailScanner.service
cron/SendReminder.service
cron/modules/com_vtiger_workflow/com_vtiger_workflow.service
data/VTEntityDelta.php
database/DatabaseConnection.php
htaccess.txt
include/CustomFieldUtil.php
include/InventoryHandler.php
include/ListView/ListViewController.php
include/QueryGenerator/QueryGenerator.php
include/Webservices/Create.php
include/Webservices/CustomerPortalWS.php
include/Webservices/DataTransform.php
include/Webservices/Login.php
include/Webservices/LoginPortal.php
include/Webservices/PreserveGlobal.php
include/Webservices/ProductLines.php
include/Webservices/Update.php
include/Webservices/Utils.php
include/Webservices/VtigerModuleOperation.php
include/Webservices/WebserviceField.php
include/events/VTEventTrigger.inc
include/fields/DateTimeField.php
include/install/resources/utils.php
include/js/Inventory.js
include/js/advancefilter.js
include/js/de_de.lang.js
include/js/dtlviewajax.js
include/js/en_gb.lang.js
include/js/es_es.lang.js
include/js/es_mx.lang.js
include/js/fr_fr.lang.js
include/js/hu_hu.lang.js
include/js/nl_nl.lang.js
include/js/pt_br.lang.js
include/js/vtlib.js
include/language/de_de.lang.php
include/language/en_gb.lang.php
include/language/en_us.lang.php
include/language/es_es.lang.php
include/language/es_mx.lang.php
include/language/fr_fr.lang.php
include/language/hu_hu.lang.php
include/language/nl_nl.lang.php
include/language/pt_br.lang.php
include/pclzip.lib.php
include/utils/EmailTemplate.php
include/utils/ExportUtils.php
include/utils/InventoryUtils.php
include/utils/MergeUtils.php
include/utils/VTCacheUtils.php
include/utils/VtlibUtils.php
index.php
modules/Accounts/Accounts.php
modules/Accounts/CustomAction.php
modules/Accounts/ProcessDuplicates.php
modules/Accounts/language/e
Aborting
Mark
[i]If I could work while on horseback that's where I'd be doing it. There's nothing like riding... Gives new meaning to the phrase, ride to live... live to ride.[/i]
[i]If I could work while on horseback that's where I'd be doing it. There's nothing like riding... Gives new meaning to the phrase, ride to live... live to ride.[/i]