05-12-2015, 05:40 AM
(This post was last modified: 05-12-2015, 08:11 AM by polanskiman.)
I have the same issue that Mweaver. I tried the git config core.fileMode false in order for git to discard all those files where the permissions where different from default. When I run git status again, git is showing fewer files, which is expected. I still have got a few though but those are probably the files where the code have been updated. After that section I have the following:
Untracked files:
(use "git add <file>..." to include in what will be committed)
18145484715374875319e474.87062199install.php.txt
18145484715374875319e474.87062199install/
SendReminder_OBSOLETE.php
build/wsChanges/CPAuthenticateContact.php
build/wsChanges/CPChangePortalPassword.php
ETC ETC ETC
I've done a git add <filename> and that got rid of the problem.
I still have got a problem though. When I finally try git pull I get the following:
What should I do?
Untracked files:
(use "git add <file>..." to include in what will be committed)
18145484715374875319e474.87062199install.php.txt
18145484715374875319e474.87062199install/
SendReminder_OBSOLETE.php
build/wsChanges/CPAuthenticateContact.php
build/wsChanges/CPChangePortalPassword.php
ETC ETC ETC
I've done a git add <filename> and that got rid of the problem.
I still have got a problem though. When I finally try git pull I get the following:
Code:
serv> git pull
remote: Counting objects: 10316, done.
remote: Compressing objects: 100% (2404/2404), done.
remote: Total 10316 (delta 4076), reused 2526 (delta 2525), pack-reused 5386
Receiving objects: 100% (10316/10316), 9.09 MiB | 269.00 KiB/s, done.
Resolving deltas: 100% (6813/6813), done.
From https://github.com/tsolucio/corebos
c25a0bd..8f66f21 master -> origin/master
* [new branch] getrelatedfield -> origin/getrelatedfield
* [new branch] omnipay -> origin/omnipay
* [new branch] validateGlobalVar -> origin/validateGlobalVar
* [new tag] coreBOS5.5 -> coreBOS5.5
Updating c25a0bd..8f66f21
error: Your local changes to the following files would be overwritten by merge:
include/Webservices/CustomerPortalWS.php
include/Webservices/VtigerDocumentOperation.php
Please, commit your changes or stash them before you can merge.
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
ETC ETC ETCWhat should I do?