git pull issue. Please advice

[Svemar]

Hello,
Would like to ask for a help/advice, as I am not so familiar with Github version control.

Tried to update Corebos using "git pull corebos master". Somehow this ended with MERGE_MSG file opened in edit mode and I was unable to exit from it correctly, so terminated.
After this retied git pull and it showed the message that unfinished process is active, so I have deleted MERGE_MSG file and retried git pull.
Now system shows warning bellow:
---------------------
[root@dsrl corebos]# git pull corebos master
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:

git config pull.rebase false # merge (the default strategy)
git config pull.rebase true # rebase
git config pull.ff only # fast-forward only

You can replace "git config" with "git config --global" to set a default
preference for all repositories. You can also pass --rebase, --no-rebase,
or --ff-only on the command line to override the configured default per
invocation.

From https://github.com/tsolucio/corebos
* branch master -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
.github/SECURITY.md Popup.php Smarty/templates/AddProductToPriceBooks.tpl Smarty/templates/AddProductsToPriceBook.tpl Smarty/templates/AdvanceFilter.tpl Smarty/templates/BrowserVariables.tpl Smarty/templates/Components/Components.tpl Smarty/templates/Components/ComponentsJS.tpl Smarty/templates/Components/DetailViewPirvNext.tpl Smarty/templates/Components/Kanban/KanbanHeader.tpl Smarty/templates/Components/MasterDetail/GridBody.tpl Smarty/templates/Components/MasterDetail/GridHeader.tpl Smarty/templates/Components/Paint/index.tpl Smarty/templates/Components/Photo2Doc/index.tpl Smarty/templates/ComposeEmail.tpl Smarty/templates/CustomFieldMapping.tpl Smarty/templates/CustomView.tpl Smarty/templates/DetailView.tpl Smarty/templates/DetailViewUI.tpl Smarty/templates/EditViewUI.tpl Smarty/templates/EmailDetailView.tpl Smarty/templates/Header.tpl Smarty/templates/Inventory/EditViewUI.tpl Smarty/templates/KanbanView.tpl Smarty/templates/ListView.tpl Smarty/templates/ListViewButtons.tpl Smarty/templates/ListViewCustomButtons.tpl Smarty/templates/ListViewEntries.tpl Smarty/templates/ListViewSearch.tpl Smarty/templates/ListViewTUIGrid.tpl Smarty/templates/LoginHeader.tpl Smarty/templates/MailScanner/MailScannerEdit.tpl Smarty/templates/MailScanner/MailScannerRule.tpl Smarty/templates/MailScanner/MailScannerRuleEdit.tpl Smarty/templates/MassCreateGridView.tpl Smarty/templates/MergeFields.tpl Smarty/templates/PivotView.tpl Smarty/templates/Popup.tpl Smarty/templates/PrintEmail.tpl Smarty/templates/PrintReport.tpl Smarty/templates/RelatedListNew.tpl Smarty/templates/RelatedLists.tpl Smarty/templates/ReportContents.tpl Smarty/templates/RolePopup.tpl Smarty/templates/SelectEmail.tpl Smarty/templates/Settings.tpl Smarty/templates/Settings/LayoutBlockEntries.tpl Smarty/templates/Settings/LayoutBlockList.tpl Smarty/templates/Settings/OrderRelatedList.tpl Smarty/templates/TagCloudDisplay.tpl Smarty/templates/com_vtiger_workflow/ActionMenu.tpl Smarty/templates/com_vtiger_workflow/EditTask.tpl Smarty/templates/com_vtiger_workflow/ListWorkflows.tpl Smarty/templates/com_vtiger_workflow/TaskSummaryList.tpl Smarty/templates/com_vtiger_workflow/taskforms/Many2ManyRelation.tpl Smarty/templates/modules/Documents/dropzone.tpl Smarty/templates/modules/Import/Import_Step4.tpl Smarty/templates/modules/Mobile/Header.tpl Smarty/templates/modules/Mobile/Login.tpl Smarty/templates/modules/Mobile/PanelMenu.tpl Smarty/templates/modules/ModComments/widgets/DetailViewBlockComment.tpl Smarty/templates/modules/SMSNotifier/SMSNotifierSelectWizard.tpl Smarty/templates/modules/SMSNotifier/SMSNotifierServerNotAvailable.tpl Smarty/templates/modules/Utilities/clickhouse.tpl Smarty/templates/modules/Utilities/facebook.tpl Smarty/templates/modules/Utilities/mautic.tpl Smarty/templates/modules/Vtiger/Settings.tpl Smarty/templates/modules/Vtiger/phpversionfail.tpl Smarty/templates/modules/VtigerBackup/BackupServer.tpl Smarty/templates/modules/Webforms/DetailView.tpl Smarty/templates/modules/Webforms/EditView.tpl Smarty/templates/modules/Webforms/FieldsView.tpl Smarty/templates/modules/Webforms/HTMLView.tpl Smarty/templates/modules/Webforms/ListView.tpl Smarty/templates/modules/cbLoginHistory/index.tpl Smarty/templates/modules/cbMap/GenMapHeader.tpl Smarty/templates/modules/cbMap/MassUpsertGrid.tpl Smarty/templates/modules/cbQuestion/Builder.tpl Smarty/templates/modules/cbQuestion/Grid.tpl Smarty/templates/modules/evvtgendoc/BasicSettings.tpl Smarty/templates/showSetOfFields.tpl build/HelperScripts/addModComments.php build/HelperScripts/addPhoto2Document.php build/HelperScripts/addQuickRelatedList.php build/HelperScripts/bettersafe.sh build/HelperScripts/checkFieldUsage.php build/HelperScripts/coreBOSEventsLoader.php build/HelperScripts/deleteModule.php build/HelperScripts/evalwf.php build/HelperScripts/export_language_filesystem.php build/HelperScripts/export_package_database.php build/HelperScripts/export_package_filesystem.php build/HelperScripts/importpricebookcsv.php build/HelperScripts
-------------------

Please advice how to proceed.
Should I use git reset -- hard and retry git pull, or do something else.
With Best regards
Svermar