Just tried doing update from CLI and got the following long list of files that would be overwritten by merge. In the end it says update successful although two lines before saying aborting. Something I need to worry about or how to fix?
$ sudo php update_cli.php
error: Your local changes to the following files would be overwritten by merge:
CHANGELOG.md
SECURITY.md
accounts.php
admin_api.php
admin_app_log.php
admin_audit_log.php
admin_backup.php
admin_category.php
admin_custom_link.php
admin_debug.php
admin_document_template.php
admin_document_template_details.php
admin_mail_queue.php
admin_project_template.php
admin_role.php
admin_settings_company.php
admin_settings_custom_fields.php
admin_settings_invoice.php
admin_settings_mail.php
admin_settings_notification.php
admin_settings_online_payment.php
admin_settings_online_payment_clients.php
admin_settings_ticket.php
admin_software_template.php
admin_tag.php
admin_tax.php
admin_ticket_status.php
admin_ticket_template.php
admin_ticket_template_details.php
admin_vendor_template.php
ajax.php
ajax/ajax_asset_copy.php
ajax/ajax_asset_details.php
ajax/ajax_contact_details.php
ajax/ajax_credential_edit.php
ajax/ajax_custom_ticket_status_edit.php
ajax/ajax_document_edit.php
ajax/ajax_document_template_edit.php
ajax/ajax_document_view.php
ajax/ajax_expense_copy.php
ajax/ajax_expense_edit.php
ajax/ajax_notifications.php
ajax/ajax_project_edit.php
ajax/ajax_recurring_expense_edit.php
ajax/ajax_recurring_ticket_edit.php
ajax/ajax_service_details.php
ajax/ajax_service_edit.php
ajax/ajax_software_template_edit.php
ajax/ajax_ticket_edit.php
ajax/ajax_ticket_template_task_edit.php
ajax/ajax_vendor_edit.php
ajax/ajax_vendor_template_edit.php
api/v1/documents/create.php
api/v1/documents/update.php
api/v1/tickets/create.php
asset_details.php
assets.php
calendar.php
certificates.php
client/includes/header.php
client/index.php
client/post.php
client_document_details.php
client_documents.php
client_overview.php
client_racks.php
clients.php
contact_details.php
contacts.php
credentials.php
css/itflow_custom.css
dashboard.php
database_updates.php
db.sql
domains.php
expenses.php
functions.php
global_search.php
guest/guest_ajax.php
guest/guest_pay_invoice_stripe.php
guest/guest_post.php
guest/guest_view_invoice.php
guest/guest_view_quote.php
includes/admin_side_nav.php
includes/app_version.php
includes/client_overview_side_nav.php
includes/client_side_nav.php
includes/database_version.php
includes/filter_footer.php
includes/footer.php
includes/get_settings.php
includes/header.php
includes/inc_all_client.php
includes/inc_client_top_head.php
includes/side_nav.php
includes/top_nav.php
invoice.php
invoices.php
js/guest_pay_invoice_stripe.js
js/ticket_time_tracking.js
locations.php
modals/asset_add_modal.php
modals/asset_import_modal.php
modals/client_document_add_from_template_modal.php
modals/client_file_upload_modal.php
modals/expense_add_modal.php
modals/expense_export_modal.php
modals/invoice_recurring_add_modal.php
modals/project_add_modal.php
modals/project_link_ticket_modal.php
modals/recurring_expense_create_modal.php
modals/recurring_invoice_note_modal.php
modals/recurring_ticket_add_modal.php
modals/service_add_modal.php
modals/software_add_from_template_modal.php
modals/ticket_add_modal.php
modals/ticket_bulk_edit_category_modal.php
modals/ticket_edit_asset_modal.php
modals/ticket_edit_vendor_modal.php
modals/ticket_invoice_add_modal.php
modals/vendor_add_from_template_modal.php
networks.php
payments.php
plugins/DataTables/datatables.css
plugins/DataTables/datatables.js
plugins/DataTables/datatables.min.css
plugins/DataTables/datatables.min.js
plugins/PHPMailer/README.md
plugins/PHPMailer/VERSION
plugins/PHPMailer/language/phpmailer.lang-pt.php
plugins/PHPMailer/src/PHPMailer.php
plugins/PHPMailer/src/POP3.php
plugins/PHPMailer/src/SMTP.php
plugins/fullcalendar/dist/index.global.js
plugins/fullcalendar/dist/index.global.min.js
plugins/fullcalendar/packages/bootstrap4/index.global.js
plugins/fullcalendar/packages/bootstrap4/index.global.min.js
plugins/fullcalendar/packages/bootstrap5/index.global.js
plugins/fullcalendar/packages/bootstrap5/index.global.min.js
plugins/fullcalendar/packages/core/index.global.js
p
error: The following untracked working tree files would be overwritten by merge:
admin_identity_provider.php
ajax/ajax_asset_link_credential.php
ajax/ajax_asset_link_document.php
ajax/ajax_asset_link_file.php
ajax/ajax_asset_link_service.php
ajax/ajax_asset_link_software.php
ajax/ajax_contact_link_asset.php
ajax/ajax_contact_link_credential.php
ajax/ajax_contact_link_document.php
ajax/ajax_contact_link_file.php
ajax/ajax_contact_link_service.php
ajax/ajax_contact_link_software.php
ajax/ajax_document_version_view.php
ajax/ajax_invoice_pay.php
client/recurring_invoices.php
css/quote_dropdowns_fix.css
plugins/PHPMailer/SMTPUTF8.md
plugins/fullcalendar/README.md
plugins/stripe-php/CONTRIBUTING.md
plugins/stripe-php/justfile
plugins/stripe-php/lib/Events/V2CoreEventDestinationPingEvent.php
plugins/stripe-php/lib/InvoicePayment.php
plugins/stripe-php/lib/Service/InvoicePaymentService.php
plugins/tinymce/notices.txt
post/admin/admin_identity_provider.php
Please move or remove them before you merge.
Aborting
Updating 83e15e9e..6df04390
Update successful