+- CoreBOSBB (https://discussions.corebos.org)
+-- Forum: Support (https://discussions.corebos.org/forumdisplay.php?fid=17)
+--- Forum: Administrator Support (https://discussions.corebos.org/forumdisplay.php?fid=8)
+--- Thread: [ solved ] error on updated - git pull (/showthread.php?tid=1445)
[ solved ] error on updated - git pull - rslemer - 03-26-2019
Updating 6a11f82..970fe21
error: Untracked working tree file 'Smarty/templates/modules/evvtgendoc/BasicSettings.tpl' would be overwritten by merge. Aborting
[root@crm corebos-master]# rm Smarty/templates/modules/evvtgendoc/BasicSettings.tpl
rm: remove regular file `Smarty/templates/modules/evvtgendoc/BasicSettings.tpl'? y
[root@crm corebos-master]# git pull
Updating 6a11f82..970fe21
error: Untracked working tree file 'Smarty/templates/modules/evvtgendoc/BasicSettingsContents.tpl' would be overwritten by merge. Aborting
[root@crm corebos-master]# rm Smarty/templates/modules/evvtgendoc/BasicSettingsContents.tpl
rm: remove regular file `Smarty/templates/modules/evvtgendoc/BasicSettingsContents.tpl'? y
[root@crm corebos-master]# git pull
Updating 6a11f82..970fe21
error: Untracked working tree file 'Smarty/templates/modules/evvtgendoc/ServerSettings.tpl' would be overwritten by merge. Aborting
[root@crm corebos-master]# rm Smarty/templates/modules/evvtgendoc/ServerSettings.tpl
rm: remove regular file `Smarty/templates/modules/evvtgendoc/ServerSettings.tpl'? y
[root@crm corebos-master]# git pull
Updating 6a11f82..970fe21
error: Untracked working tree file 'Smarty/templates/modules/evvtgendoc/gendocdiv.tpl' would be overwritten by merge. Aborting
[root@crm corebos-master]# rm Smarty/templates/modules/evvtgendoc/gendocdiv.tpl
rm: remove regular file `Smarty/templates/modules/evvtgendoc/gendocdiv.tpl'? y
[root@crm corebos-master]# git pull
Updating 6a11f82..970fe21
error: Untracked working tree file 'Smarty/templates/modules/evvtgendoc/index.tpl' would be overwritten by merge. Aborting
[root@crm corebos-master]# rm Smarty/templates/modules/evvtgendoc/index.tpl
rm: remove regular file `Smarty/templates/modules/evvtgendoc/index.tpl'? y
[root@crm corebos-master]# git pull
Updating 6a11f82..970fe21
error: Untracked working tree file 'Smarty/templates/modules/evvtgendoc/odt.tpl' would be overwritten by merge. Aborting
[root@crm corebos-master]# rm Smarty/templates/modules/evvtgendoc/odt.tpl
rm: remove regular file `Smarty/templates/modules/evvtgendoc/odt.tpl'? y
[root@crm corebos-master]# git pull
Updating 6a11f82..970fe21
error: Untracked working tree file 'modules/evvtgendoc/BasicSettings.php' would be overwritten by merge. Aborting
[root@crm corebos-master]# rm modules/evvtgendoc/BasicSettings.php
rm: remove regular file `modules/evvtgendoc/BasicSettings.php'? y
[root@crm corebos-master]#
[root@crm corebos-master]# git pull
Updating 6a11f82..970fe21
error: Untracked working tree file 'modules/evvtgendoc/DetailViewWidget.php' would be overwritten by merge. Aborting
[root@crm corebos-master]# rm modules/evvtgendoc/DetailViewWidget.php
rm: remove regular file `modules/evvtgendoc/DetailViewWidget.php'? y
[root@crm corebos-master]# git pull
Updating 6a11f82..970fe21
error: Untracked working tree file 'modules/evvtgendoc/GenDocDocumentation.odt' would be overwritten by merge. Aborting
[root@crm corebos-master]# rm modules/evvtgendoc/GenDocDocumentation.odt
rm: remove regular file `modules/evvtgendoc/GenDocDocumentation.odt'? y
[root@crm corebos-master]# git pull
Updating 6a11f82..970fe21
error: Untracked working tree file 'modules/evvtgendoc/GenDocDocumentation.pdf' would be overwritten by merge. Aborting
[root@crm corebos-master]#
I think this module was added for default in coreBOS
Problem appears when installation already with this module ....
error in cbUpdater too
RE: error on updated - git pull - joebordes - 03-26-2019
you have to version the files or delete them. If you haven't modified them just delete them
RE: error on updated - git pull - joebordes - 03-26-2019
the cbupdater error seems like you haven't installed MsgTemplate module, that one must be installed before the other two