C:\liquibase\kes\kes-backend\Migration>git pull origin release                                                                                                warning: redirecting to https://git1.bris.kuzesc.ru/kes/kes-backend.git/
From https://git1.bris.kuzesc.ru/kes/kes-backend
 * branch              release    -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
        ORDS/Modules/acl_structures.sql
        ORDS/Modules/administrations.sql
        ORDS/Modules/contracts.sql
        ORDS/Modules/current_tranformer_models.sql
        ORDS/Modules/current_transformers.sql
        ORDS/Modules/declension.sql
        ORDS/Modules/documents.sql
        ORDS/Modules/electrical_network_topology.sql
        ORDS/Modules/enterprises.sql
        ORDS/Modules/enterprises_energy_restriction_types.sql
        ORDS/Modules/equipment_statuses.sql
        ORDS/Modules/financig_sources.sql
        ORDS/Modules/justification_recalculation_reasons.sql
        ORDS/Modules/measuring_complex_locations.sql
        ORDS/Modules/measuring_complex_violation_types.sql
        ORDS/Modules/metering_device_interfaces.sql
        ORDS/Modules/metering_device_models.sql
        ORDS/Modules/ministries.sql
        ORDS/Modules/network_organizations.sql
        ORDS/Modules/oreim_sections.sql
        ORDS/Modules/peak_hours_day.sql
        ORDS/Modules/peak_hours_month.sql
        ORDS/Modules/positions.sql
        ORDS/Modules/power_payment_ratios.sql
        ORDS/Modules/power_receiving_device_modes.sql
        ORDS/Modules/power_supply_facility_types.sql
        ORDS/Modules/production_calendar_days.sql
        ORDS/Modules/production_calendars.sql
        ORDS/Modules/reports.sql
        ORDS/Modules/suggestions.sql
        ORDS/Modules/system.sql
        ORDS/Modules/tangent_phi.sql
        ORDS/Modules/templates.sql
        ORDS/Modules/voltage_tranformer_models.sql
        ORDS/Routes/Acl_structures/get_acl_structure_signer_parent.sql
        ORDS/Routes/Contracts/delete_contract.sql
        ORDS/Routes/Contracts/delete_contract_contact.sql
        ORDS/Routes/Contracts/delete_contract_contact_notification.sql
        ORDS/Routes/Contracts/delete_contract_dossier.sql
        ORDS/Routes/Contracts/delete_contract_signer.sql
        ORDS/Routes/Contracts/delete_contract_version.sql
        ORDS/Routes/Contracts/get_contract.sql
        ORDS/Routes/Contracts/get_contract_signers_acl_structure.sql
        ORDS/Routes/Contracts/get_contract_signers_enterprise.sql
        ORDS/Routes/Contracts/post_contract.sql
        ORDS/Routes/Contracts/post_contract_contact_notifications.sql
        ORDS/Routes/Contracts/post_contract_contacts.sql
        ORDS/Routes/Contracts/post_contract_signers_acl_structure.sql
        ORDS/Routes/Contracts/post_contract_signers_enterprise.sql
        ORDS/Routes/Contracts/post_contract_version.sql
        ORDS/Routes/Contracts/post_contract_version_from_registry.sql
        ORDS/Routes/Contracts/put_contract_contact_notifications.sql
        ORDS/Routes/Contracts/put_contract_contacts.sql
        ORDS/Routes/Contracts/put_contract_version.sql
        ORDS/Routes/Documents/create_document.sql
        ORDS/Routes/Documents/get_document.sql
        ORDS/Routes/Documents/get_document_groups_and_types.sql
        ORDS/Routes/Documents/get_document_type_parameters.sql
        ORDS/Routes/Documents/get_document_type_templates.sql
        ORDS/Routes/Documents/get_documents_departments.sql                                                                                                           ORDS/Routes/Documents/update_document.sql                                                                                                        13:33        ORDS/Routes/Enterprises/put_enterprises_addresses.sql
        ORDS/Routes/Files/put_file.sql
        ORDS/Routes/Measuring_complex_locations/post_measuring_complex_locations.sql
        ORDS/Routes/Measuring_complex_locations/put_measuring_complex_locations.sql
        ORDS/Routes/Power_supply_facility_types/post_power_supply_facility_types.sql
        ORDS/Routes/Power_supply_facility_types/put_power_supply_facility_types.sql
        ORDS/Routes/Tariff_consumer_groups/delete_tariff_consumer_groups.sql
        ORDS/Routes/Tariff_consumer_groups/get_tariff_consumer_groups.sql
        ORDS/Routes/Tariff_consumer_groups/post_tariff_consumer_groups.sql
        ORDS/Routes/Tariff_consumer_groups/put_tariff_consumer_groups.sql
        ORDS/Routes/Templates/create_document_template.sql
        ORDS/Routes/Templates/delete_document_template_version.sql
        ORDS/Routes/Templates/generate_document_by_template.sql
        ORDS/Routes/Templates/get_document_template.sql
        ORDS/Routes/Templates/update_document_template.sql
        Source/Functions/add_acl_structure.sql
        Source/Functions/add_acl_structures_history.sql
        Source/Functions/get_acl_structure_clob.sql
        Source/Functions/update_acl_structure_version.sql
        Source/Jobs/update_templates_end_dates.sql
        Source/Package Bodies/acl_structures.sql
        Source/Package Bodies/contracts.sql
        Source/Package Bodies/dadata_utils.sql
        Source/Package Bodies/decl
error: The following untracked working tree files would be overwritten by merge:
        ORDS/Routes/Documents/update_document_departments.sql
        ORDS/Routes/Enterprises/put_enterprises_contract_addresses.sql
        ORDS/Routes/Peak_hours_day/delete_peak_hours_day.sql
        Source/Functions/get_addresses_for_replacement_in_contracts.sql
        Source/Package Bodies/template_contract_type_links.sql
        Source/Package Bodies/template_okopf_links.sql
        Source/Packages/template_contract_type_links.sql
        Source/Packages/template_okopf_links.sql
        Source/Triggers/contract_type_links_bi_tr.sql
        Source/Triggers/contract_type_links_bu_tr.sql
        Source/Triggers/contracts_history_au_tr.sql
        Source/Triggers/enterprises_history_ctiu_tr.sql
        Source/Triggers/measuring_complex_violation_type_history_au_tr.sql
        Source/Triggers/template_contract_type_links_bi_tr.sql
        Source/Triggers/template_contract_type_links_bu_tr.sql
        Source/Triggers/template_okopf_links_bi_tr.sql
        Source/Triggers/template_okopf_links_bu_tr.sql
        Source/Triggers/user_history_au_tr.sql
        Source/Types/acl_structure_history_t.sql
        Source/Types/acl_structures_history_t.sql
        Source/Types/contract_contact_t.sql
        Source/Types/contract_contacts_t.sql
        Source/Types/contract_payment_term_t.sql
        Source/Types/contract_payment_terms_t.sql
        Source/Types/numbers_t.sql
        Source/Views/acl_structures_interdistrict_branches.sql
        Source/Views/template_contract_types_links.sql
        Source/Views/template_okopf_links.sql                                                                                                                         Source/Views/templates_all.sql                                                                                                                        Please move or remove them before you merge.                                                                                                                  Aborting                                                                                                                                                      Updating 6e8073dd..18a6b692                                                                                                                                                                                                                                                                                                 C:\liquibase\kes\kes-backend\Migration>                                                                                                                      ↑