Загрузка данных

dyadebian@dyadebian:~/Workflow/Projects/ecologist$ git merge --squash rel_ABDULLIN-2
Auto-merging .gitlab-ci.yml
CONFLICT (content): Merge conflict in .gitlab-ci.yml
Auto-merging .gitmodules
CONFLICT (add/add): Merge conflict in .gitmodules
Auto-merging CMakeLists.txt
Auto-merging build_wd_deb12
CONFLICT (content): Merge conflict in build_wd_deb12
CONFLICT (add/add): Merge conflict in build_wd_deb12_debug.sh
warning: Cannot merge binary files: import/bin/linux/libsgsap.so.1.0.77.0 (HEAD vs. rel_ABDULLIN-2)
Auto-merging import/bin/linux/libsgsap.so.1.0.77.0
CONFLICT (content): Merge conflict in import/bin/linux/libsgsap.so.1.0.77.0
Auto-merging src/pp_worker/CMakeLists.txt
CONFLICT (content): Merge conflict in src/pp_worker/CMakeLists.txt
Auto-merging src/pp_worker/src/client_connection.cpp
CONFLICT (content): Merge conflict in src/pp_worker/src/client_connection.cpp
Auto-merging src/pp_worker/src/client_connection.h
CONFLICT (content): Merge conflict in src/pp_worker/src/client_connection.h
Auto-merging src/pp_worker/src/pp_worker.cpp
CONFLICT (content): Merge conflict in src/pp_worker/src/pp_worker.cpp
Auto-merging src/pp_worker/src/pp_worker.h
CONFLICT (content): Merge conflict in src/pp_worker/src/pp_worker.h
Auto-merging src/pp_worker/src/pp_worker.rc
CONFLICT (content): Merge conflict in src/pp_worker/src/pp_worker.rc
Auto-merging src/pp_worker/src/ppw_version.h
CONFLICT (content): Merge conflict in src/pp_worker/src/ppw_version.h
CONFLICT (modify/delete): src/pp_worker/src/united_reader/Config.hpp deleted in rel_ABDULLIN-2 and modified in HEAD.  Version HEAD of src/pp_worker/src/united_reader/Config.hpp left in tree.
Auto-merging src/pp_worker/src/united_reader/UnitedReader.cpp
CONFLICT (content): Merge conflict in src/pp_worker/src/united_reader/UnitedReader.cpp
Auto-merging src/pp_worker/src/united_reader/UnitedReader.hpp
Auto-merging src/pp_worker/src/united_reader/impl/ethernet_impl.cpp
CONFLICT (content): Merge conflict in src/pp_worker/src/united_reader/impl/ethernet_impl.cpp
Auto-merging src/pp_worker/src/united_reader/impl/file_impl.cpp
Auto-merging src/pp_worker/src/united_reader/impl/file_impl.hpp
Auto-merging src/pp_worker/src/united_reader/impl/impl.hpp
Auto-merging src/pp_worker/src/united_reader/pool/PacketPool.cpp
Auto-merging src/pp_worker/src/vbs_detector_subscriber.cpp
CONFLICT (content): Merge conflict in src/pp_worker/src/vbs_detector_subscriber.cpp
Auto-merging src/pp_worker/src/version.h
CONFLICT (content): Merge conflict in src/pp_worker/src/version.h
Auto-merging src/protocol_processor/CMakeLists.txt
CONFLICT (content): Merge conflict in src/protocol_processor/CMakeLists.txt
Auto-merging src/protocol_processor/include/handler_error.h
CONFLICT (content): Merge conflict in src/protocol_processor/include/handler_error.h
Auto-merging src/protocol_processor/include/isubscriber.h
Auto-merging src/protocol_processor/include/protocol_processor_module.h
CONFLICT (content): Merge conflict in src/protocol_processor/include/protocol_processor_module.h
Auto-merging src/protocol_processor/src/handlers/IOContainer.cpp
CONFLICT (content): Merge conflict in src/protocol_processor/src/handlers/IOContainer.cpp
Auto-merging src/protocol_processor/src/handlers/IOContainer.hpp
CONFLICT (content): Merge conflict in src/protocol_processor/src/handlers/IOContainer.hpp
Auto-merging src/protocol_processor/src/handlers/custom_handler_bssap.cpp
Auto-merging src/protocol_processor/src/handlers/custom_handler_creator.cpp
CONFLICT (content): Merge conflict in src/protocol_processor/src/handlers/custom_handler_creator.cpp
Auto-merging src/protocol_processor/src/handlers/custom_handler_ranap.cpp
Auto-merging src/protocol_processor/src/handlers/custom_handler_ranap.h
Auto-merging src/protocol_processor/src/handlers/custom_handler_sgsap.cpp
Auto-merging src/protocol_processor/src/handlers/custom_handler_sgsap.h
Auto-merging src/protocol_processor/src/handlers/custom_handler_tcap_map.cpp
Auto-merging src/protocol_processor/src/handlers/custom_handler_type.h
CONFLICT (content): Merge conflict in src/protocol_processor/src/handlers/custom_handler_type.h
Auto-merging src/protocol_processor/src/handlers/handler_bssap_tmsi_key.cpp
CONFLICT (content): Merge conflict in src/protocol_processor/src/handlers/handler_bssap_tmsi_key.cpp
Auto-merging src/protocol_processor/src/handlers/handler_bssap_tmsi_key.h
Auto-merging src/protocol_processor/src/handlers/packet_handler.cpp
Auto-merging src/protocol_processor/src/handlers/packet_handler_GTPv1v2.cpp
Auto-merging src/protocol_processor/src/handlers/packet_handler_ipv4.cpp
CONFLICT (content): Merge conflict in src/protocol_processor/src/handlers/packet_handler_ipv4.cpp
Auto-merging src/protocol_processor/src/handlers/packet_handler_sccp.cpp
CONFLICT (content): Merge conflict in src/protocol_processor/src/handlers/packet_handler_sccp.cpp
Auto-merging src/protocol_processor/src/handlers/packet_handler_sctp.cpp
CONFLICT (content): Merge conflict in src/protocol_processor/src/handlers/packet_handler_sctp.cpp
Auto-merging src/protocol_processor/src/handlers/packet_handler_udp.cpp
Auto-merging src/protocol_processor/src/handlers/sctp.h
Auto-merging src/protocol_processor/src/handlers/sctp_controller.cpp
CONFLICT (content): Merge conflict in src/protocol_processor/src/handlers/sctp_controller.cpp
Auto-merging src/protocol_processor/src/handlers/ss7fw/custom_handler_ss7fw.cpp
CONFLICT (add/add): Merge conflict in src/protocol_processor/src/handlers/ss7fw/custom_handler_ss7fw.cpp
Auto-merging src/protocol_processor/src/handlers/ss7fw/custom_handler_ss7fw.h
CONFLICT (add/add): Merge conflict in src/protocol_processor/src/handlers/ss7fw/custom_handler_ss7fw.h
Auto-merging src/protocol_processor/src/handlers/ss7fw/e1config/E1Config.cpp
CONFLICT (add/add): Merge conflict in src/protocol_processor/src/handlers/ss7fw/e1config/E1Config.cpp
Auto-merging src/protocol_processor/src/handlers/ss7fw/e1config/E1Config.h
CONFLICT (add/add): Merge conflict in src/protocol_processor/src/handlers/ss7fw/e1config/E1Config.h
Auto-merging src/protocol_processor/src/handlers/ss7fw/helpers.hpp
CONFLICT (add/add): Merge conflict in src/protocol_processor/src/handlers/ss7fw/helpers.hpp
Failed to merge submodule src/protocol_processor/src/handlers/ss7fw/libfw-ss7 (not checked out)
CONFLICT (submodule): Merge conflict in src/protocol_processor/src/handlers/ss7fw/libfw-ss7
Auto-merging src/protocol_processor/src/handlers/ss7fw/ss7_fw_base.h
CONFLICT (add/add): Merge conflict in src/protocol_processor/src/handlers/ss7fw/ss7_fw_base.h
Auto-merging src/protocol_processor/src/ports/abstract_port.cpp
CONFLICT (content): Merge conflict in src/protocol_processor/src/ports/abstract_port.cpp
Auto-merging src/protocol_processor/src/ports/abstract_port.h
Auto-merging src/protocol_processor/src/protocol_processor_module.cpp
CONFLICT (content): Merge conflict in src/protocol_processor/src/protocol_processor_module.cpp
Auto-merging src/protocol_processor/src/version.h
CONFLICT (content): Merge conflict in src/protocol_processor/src/version.h
Auto-merging src/storage_manager/src/version.h
CONFLICT (content): Merge conflict in src/storage_manager/src/version.h
Auto-merging src/tools/misc/timeval.hpp
CONFLICT (add/add): Merge conflict in src/tools/misc/timeval.hpp
CONFLICT (modify/delete): src/tools/thread/affinity.hpp deleted in HEAD and modified in rel_ABDULLIN-2.  Version rel_ABDULLIN-2 of src/tools/thread/affinity.hpp left in tree.
Recursive merging with submodules currently only supports trivial cases.
Please manually handle the merging of each conflicted submodule.
This can be accomplished with the following steps:
 - come back to superproject and run:

      git add src/protocol_processor/src/handlers/ss7fw/libfw-ss7

   to record the above merge or update
 - resolve any other conflicts in the superproject
 - commit the resulting index in the superproject
Squash commit -- not updating HEAD
Automatic merge failed; fix conflicts and then commit the result.