Using git pull

[polanskiman]

(05-12-2015, 10:37 PM)joebordes Wrote: You can't add the files because they are already in the project, that is why you get a conflict when you try to pull, you have to delete untracked files that are already in the base project. You can use "git reset" if you haven't committed the changes.

As to the recommended permissions the thing is that git versions the state, whether I want to or not, git is going to register and control that information, so the recommended status is the one in the repository (in most of the files). If you need something different for your specific install then you simply execute the "ignore" command on your system. I really have no choice.

Well those untracked files that I added are not the ones that are showing when I do a git pull. Anyways I did a git reset as recommended, did a git status then deleted all untracked files from CoreBOS directory then did a git pull. Same problem. This is what I get:

Code:

Serv> git pull
Updating c25a0bd..8f66f21
error: Your local changes to the following files would be overwritten by merge:
    .gitignore
    README.md
    Smarty/templates/Header.tpl
    Smarty/templates/Home/HomeBlock.tpl
    Smarty/templates/Login.tpl
    Smarty/templates/Settings/EmailConfig.tpl
    Smarty/templates/com_vtiger_workflow/ListWorkflows.tpl
    cron/SendReminder.service
    cron/send_mail.php
    data/CRMEntity.php
    include/Webservices/ExtendSession.php
    include/Webservices/ModuleTypes.php
    include/Webservices/VtigerCRMObjectMeta.php
    include/install/language/de_de.lang.php
    include/install/language/en_gb.lang.php
    include/install/language/en_us.lang.php
    include/install/language/es_es.lang.php
    include/install/language/es_mx.lang.php
    include/install/language/nl_nl.lang.php
    include/install/language/pt_br.lang.php
    include/install/resources/utils.php
    include/js/general.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/hu_hu.lang.php
    include/language/nl_nl.lang.php
    include/language/pt_br.lang.php
    include/php_writeexcel/class.writeexcel_formula.inc.php
    include/style.css
    include/utils/CommonUtils.php
    include/utils/InventoryUtils.php
    include/utils/utils.php
    modules/Accounts/Accounts.js
    modules/CustomView/SendMailAction.php
    modules/Documents/DetailView.php
    modules/Documents/Documents.php
    modules/Emails/class.phpmailer.php
    modules/Emails/class.smtp.php
    modules/Emails/mail.php
    modules/Import/controllers/Import_Data_Controller.php
    modules/Import/controllers/Import_Index_Controller.php
    modules/MailManager/src/models/Draft.php
    modules/ModTracker/ModTracker.php
    modules/PurchaseOrder/PurchaseOrder.php
    modules/Quotes/Quotes.php
    modules/Reports/ReportRun.php
    modules/SalesOrder/SalesOrder.php
    modules/SalesOrder/SalesOrderPDFController.php
    modules/Settings/EmailConfig.php
    modules/Settings/Save.php
    modules/Settings/language/en_gb.lang.php
    modules/Settings/language/en_us.lang.php
    modules/Settings/language/es_es.lang.php
    modules/Settings/language/es_mx.lang.php
    modules/Settings/language/fr_fr.lang.php
    modules/Settings/language/hu_hu.lang.php
    modules/Settings/language/pt_br.lang.php
    modules/com_vtiger_workflow/VTWorkflowApplication.inc
    modules/com_vtiger_workflow/editworkflow.php
    modules/com_vtiger_workflow/expression_engine/VTParser.inc
    modules/com_vtiger_workflow/expression_engine/VTTokenizer.inc
    modules/com_vtiger_workflow/tasklist.php
    modules/com_vtiger_workflow/tasks/VTUpdateFieldsTask.inc
    modules/com_vtiger_workflow/workflowlist.php
    schema/DatabaseSchema.xml
    upgrade2coreBOS.php
    vtlib/Vtiger/Block.php
    vtlib/Vtiger/Mailer.php
    vtlib/Vtiger/PackageImport.php
    vtlib/Vtiger/Unzip.php
    webservice.php
Please, commit your changes or stash them before you can merge.
Aborting