Git-Debug 回退分支查找问题

本文介绍在多人协作开发中遇到问题时,如何通过创建备用分支,逐步合并代码并检测差异,以确定导致问题的特定提交的方法。

该场景用于你在多人开发中当前版本出现了问题,但是不知道中间的哪次提交导致的,采用回溯的方式去查找问题。

  1. 创建一个指定的你认为没有问题的起点分支,暂定未Debug
  2. 然后逐段采用合并的方式去查看有没有问题
  3. 当查找到问题段以后可以对比版本差异来分析是哪里的问题

wyl@ubuntu:~/NVMP/nvmp$ git status On branch develop_sz0519 Your branch and 'origin/develop_sz0519' have diverged, and have 78 and 350 different commits each, respectively. (use "git pull" to merge the remote branch into yours) Untracked files: (use "git add <file>..." to include in what will be committed) ../compile_commit_id nothing added to commit but untracked files present (use "git add" to track) wyl@ubuntu:~/NVMP/nvmp$ git pull Auto-merging scripts/ams_upload.sh CONFLICT (content): Merge conflict in scripts/ams_upload.sh Auto-merging nvmp/tp_package/wlan/src/wlan_manager/wlan_manager.c CONFLICT (content): Merge conflict in nvmp/tp_package/wlan/src/wlan_manager/wlan_manager.c Auto-merging nvmp/tp_package/wlan/src/wlan_manager/wlan_backup.c Auto-merging nvmp/tp_package/wlan/src/wlan_data_model.c Auto-merging nvmp/tp_package/wlan/src/wlan_adapter/wlan_adapter_rtl.c Auto-merging nvmp/tp_package/wlan/src/wlan_adapter/files/wq9001/is_cal_real.script Auto-merging nvmp/tp_package/wlan/src/wlan_adapter/Makefile CONFLICT (content): Merge conflict in nvmp/tp_package/wlan/src/wlan_adapter/Makefile Auto-merging nvmp/tp_package/wlan/src/onboarding_tapo/wifi_control.h Auto-merging nvmp/tp_package/wlan/src/onboarding_tapo/wifi_control.c Auto-merging nvmp/tp_package/wlan/src/onboarding_tapo/soft_ap.h Auto-merging nvmp/tp_package/wlan/src/onboarding_tapo/soft_ap.c Auto-merging nvmp/tp_package/wlan/src/onboarding_tapo/onboarding.c CONFLICT (content): Merge conflict in nvmp/tp_package/wlan/src/onboarding_tapo/onboarding.c Auto-merging nvmp/tp_package/wlan/src/include/wlan_manager.h CONFLICT (content): Merge conflict in nvmp/tp_package/wlan/src/include/wlan_manager.h Auto-merging nvmp/tp_package/wlan/src/Makefile CONFLICT (content): Merge conflict in nvmp/tp_package/wlan/src/Makefile Auto-merging nvmp/tp_package/wlan/Makefile CONFLICT (content): Merge conflict in nvmp/tp_package/wlan/Makefile Auto-merging nvmp/tp_package/mini_main/src/Makefile Auto-merging nvmp/tp_package/mini_main/Makefile CONFLICT (content): Merge conflict in nvmp/tp_package/mini_main/Makefile Auto-merging nvmp/tp_package/main/src/Makefile CONFLICT (content): Merge conflict in nvmp/tp_package/main/src/Makefile Auto-merging nvmp/tp_package/main/files/usr/bin/dbg_cmd Auto-merging nvmp/tp_package/main/Makefile CONFLICT (content): Merge conflict in nvmp/tp_package/main/Makefile Auto-merging nvmp/tp_package/lib/libxquic/src/transport/xqc_packet_out.c Auto-merging nvmp/tp_package/lib/libxquic/src/transport/xqc_frame.c Auto-merging nvmp/tp_package/lib/libxquic/src/transport/xqc_conn.h Auto-merging nvmp/tp_package/lib/libxquic/src/transport/xqc_conn.c Auto-merging nvmp/tp_package/lib/libxquic/Makefile CONFLICT (content): Merge conflict in nvmp/tp_package/lib/libxquic/Makefile Auto-merging nvmp/tp_package/lib/libxquic/CMakeLists.txt Auto-merging nvmp/tp_package/lib/libutils/src/ringbuffer.h Auto-merging nvmp/tp_package/lib/libtss/src/tss_tlcp.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libtss/src/tss_tlcp.c Auto-merging nvmp/tp_package/lib/libtss/src/tss_crypto_mbedtls.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libtss/src/tss_crypto_mbedtls.c Auto-merging nvmp/tp_package/lib/libtss/src/Makefile CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libtss/src/Makefile Auto-merging nvmp/tp_package/lib/libtss/Makefile CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libtss/Makefile Auto-merging nvmp/tp_package/lib/libtrk/src/user/libtrk.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libtrk/src/user/libtrk.c Auto-merging nvmp/tp_package/lib/libtrk/src/files/bin/trk_ctl.sh CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libtrk/src/files/bin/trk_ctl.sh Auto-merging nvmp/tp_package/lib/libtpssl/src/mbedtls/api/tcpApi.c Auto-merging nvmp/tp_package/lib/libtpssl/src/mbedtls/api/sslApi.c CONFLICT (content): Merge conflict in nvmp/tp_package/lib/libtpssl/src/mbedtls/api/sslApi.c Auto-merging nvmp/tp_package/lib/libtpssl/src/include/sslApi.h Auto-merging nvmp/tp_package/lib/libtpssl/src/Makefile CONFLICT (content): Merge conflict in nvmp/tp_package/lib/libtpssl/src/Makefile Auto-merging nvmp/tp_package/lib/libtpssl/Makefile CONFLICT (content): Merge conflict in nvmp/tp_package/lib/libtpssl/Makefile Auto-merging nvmp/tp_package/lib/libsdm/src/system.c Auto-merging nvmp/tp_package/lib/libsdm/src/slp_model.h CONFLICT (content): Merge conflict in nvmp/tp_package/lib/libsdm/src/slp_model.h Auto-merging nvmp/tp_package/lib/libsdm/src/slp_error.h Auto-merging nvmp/tp_package/lib/libsdm/Makefile CONFLICT (content): Merge conflict in nvmp/tp_package/lib/libsdm/Makefile Auto-merging nvmp/tp_package/lib/libmpp/src/libcamera/libimage.c Auto-merging nvmp/tp_package/lib/libmpp/src/include/libimage.h Auto-merging nvmp/tp_package/lib/libmpp/src/include/libavdc.h Auto-merging nvmp/tp_package/lib/libmpp/Makefile CONFLICT (content): Merge conflict in nvmp/tp_package/lib/libmpp/Makefile Auto-merging nvmp/tp_package/lib/libmotor/src/ptz_spi/drv/spi_motor_action.c Auto-merging nvmp/tp_package/lib/libmotor/src/ptz_spi/drv/motor_model.c Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Sctp/Sctp.h CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Sctp/Sctp.h Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Sctp/Sctp.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Sctp/Sctp.c Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Rtp/Codecs/RtpH265Payloader.h CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Rtp/Codecs/RtpH265Payloader.h Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Rtp/Codecs/RtpH265Payloader.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Rtp/Codecs/RtpH265Payloader.c Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Rtcp/RollingBuffer.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Rtcp/RollingBuffer.c Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/PeerConnection/SessionDescription.h CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/PeerConnection/SessionDescription.h Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/PeerConnection/SessionDescription.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/PeerConnection/SessionDescription.c Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/PeerConnection/Rtp.h CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/PeerConnection/Rtp.h Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/PeerConnection/Rtp.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/PeerConnection/Rtp.c Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/PeerConnection/Rtcp.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/PeerConnection/Rtcp.c Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/PeerConnection/Retransmitter.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/PeerConnection/Retransmitter.c Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/PeerConnection/PeerConnection.h CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/PeerConnection/PeerConnection.h Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/PeerConnection/PeerConnection.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/PeerConnection/PeerConnection.c Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Include_i.h CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Include_i.h Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Ice/SocketConnection.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Ice/SocketConnection.c Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Ice/IceAgent.h CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Ice/IceAgent.h Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Ice/IceAgent.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Ice/IceAgent.c Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Ice/ConnectionListener.h CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Ice/ConnectionListener.h Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Ice/ConnectionListener.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Ice/ConnectionListener.c Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Crypto/Tls_mbedtls.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Crypto/Tls_mbedtls.c Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Crypto/Dtls_mbedtls.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Crypto/Dtls_mbedtls.c Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Crypto/Dtls.h CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Crypto/Dtls.h Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Crypto/Crypto.h CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/source/Crypto/Crypto.h Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/include/com/amazonaws/kinesis/video/webrtcclient/Include.h CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/src/include/com/amazonaws/kinesis/video/webrtcclient/Include.h Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/samples/kvsWebrtcClientMasterGstSample.c CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/samples/kvsWebrtcClientMasterGstSample.c Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/CMake/Dependencies/libmbedtls-CMakeLists.txt CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/amazon-kinesis-video-streams-webrtc-sdk-c/CMake/Dependencies/libmbedtls-CMakeLists.txt Auto-merging nvmp/tp_package/lib/libkvswebrtcClient/Makefile CONFLICT (add/add): Merge conflict in nvmp/tp_package/lib/libkvswebrtcClient/Makefile Auto-merging nvmp/tp_package/lib/libjson-c/src/json_api.h Auto-merging nvmp/tp_package/lib/libds/files/etc/dsd_convert.json CONFLICT (content): Merge conflict in nvmp/tp_package/lib/libds/files/etc/dsd_convert.json Auto-merging nvmp/tp_package/lib/libdms/src/msg_utils.h Auto-merging nvmp/tp_package/lib/libdms/src/msg_utils.c CONFLICT (content): Merge conflict in nvmp/tp_package/lib/libdms/src/msg_utils.c Auto-merging nvmp/tp_package/lib/libdms/src/mids.h CONFLICT (content): Merge conflict in nvmp/tp_package/lib/libdms/src/mids.h Auto-merging nvmp/tp_package/lib/libaudio/src/audio_utils.h Auto-merging nvmp/tp_package/lib/libaudio/src/audio_utils.c Auto-merging nvmp/tp_package/base-files/files-patch/preinit_ubi_overlay Auto-merging nvmp/tp_package/base-files/files-patch/preinit_ram_overlay CONFLICT (content): Merge conflict in nvmp/tp_package/base-files/files-patch/preinit_ram_overlay Auto-merging nvmp/tools/firmware-utils/src/mkslpfw.h Auto-merging nvmp/tools/firmware-utils/src/mkslpfw.c Auto-merging nvmp/tools/firmware-utils/Makefile CONFLICT (content): Merge conflict in nvmp/tools/firmware-utils/Makefile CONFLICT (rename/delete): nvmp/target/linux/ssc30x/ssc308/images/spinand/scripts/[[servicefs.es deleted in HEAD and renamed in a594a0fdc3a2a859fb8069da44896ba013432059. Version a594a0fdc3a2a859fb8069da44896ba013432059 of nvmp/target/linux/ssc30x/ssc308/images/spinand/scripts/[[servicefs.es left in tree. CONFLICT (rename/rename): Rename "nvmp/target/linux/nvt98567/nand/spinand/scripts/[[ubifs.es"->"nvmp/target/linux/nvt98567/generic/images/spinand/scripts/[[ubifs.es" in branch "HEAD" rename "nvmp/target/linux/nvt98567/nand/spinand/scripts/[[ubifs.es"->"nvmp/target/linux/ssc30x/ssc308/images/spinand/scripts/[[ubifs.es" in "a594a0fdc3a2a859fb8069da44896ba013432059" CONFLICT (rename/rename): Rename "nvmp/target/linux/nvt98567/nand/spinand/scripts/[[tpheader.es"->"nvmp/target/linux/nvt98567/generic/images/spinand/scripts/[[tpheader.es" in branch "HEAD" rename "nvmp/target/linux/nvt98567/nand/spinand/scripts/[[tpheader.es"->"nvmp/target/linux/ssc30x/ssc308/images/spinand/scripts/[[tpheader.es" in "a594a0fdc3a2a859fb8069da44896ba013432059" CONFLICT (rename/rename): Rename "nvmp/target/linux/nvt98567/nand/spinand/scripts/[[rootfs.es"->"nvmp/target/linux/nvt98567/generic/images/spinand/scripts/[[rootfs.es" in branch "HEAD" rename "nvmp/target/linux/nvt98567/nand/spinand/scripts/[[rootfs.es"->"nvmp/target/linux/ssc30x/ssc308/images/spinand/scripts/[[rootfs.es" in "a594a0fdc3a2a859fb8069da44896ba013432059" CONFLICT (rename/rename): Rename "nvmp/target/linux/nvt98567/nand/spinand/scripts/[[kernel.es"->"nvmp/target/linux/nvt98567/generic/images/spinand/scripts/[[kernel.es" in branch "HEAD" rename "nvmp/target/linux/nvt98567/nand/spinand/scripts/[[kernel.es"->"nvmp/target/linux/ssc30x/ssc308/images/spinand/scripts/[[kernel.es" in "a594a0fdc3a2a859fb8069da44896ba013432059" CONFLICT (rename/rename): Rename "nvmp/target/linux/nvt98567/nand/spinand/scripts/[[isp.es"->"nvmp/target/linux/nvt98567/generic/images/spinand/scripts/[[isp.es" in branch "HEAD" rename "nvmp/target/linux/nvt98567/nand/spinand/scripts/[[isp.es"->"nvmp/target/linux/ssc30x/ssc308/images/spinand/scripts/[[isp.es" in "a594a0fdc3a2a859fb8069da44896ba013432059" CONFLICT (rename/rename): Rename "nvmp/target/linux/nvt98567/nand/spinand/scripts/[[factory_info.es"->"nvmp/target/linux/nvt98567/generic/images/spinand/scripts/[[factory_info.es" in branch "HEAD" rename "nvmp/target/linux/nvt98567/nand/spinand/scripts/[[factory_info.es"->"nvmp/target/linux/ssc30x/ssc308/images/spinand/scripts/[[factory_info.es" in "a594a0fdc3a2a859fb8069da44896ba013432059" CONFLICT (rename/rename): Rename "nvmp/target/linux/nvt98567/nand/spinand/scripts/[[factory_boot.es"->"nvmp/target/linux/nvt98567/generic/images/spinand/scripts/[[factory_boot.es" in branch "HEAD" rename "nvmp/target/linux/nvt98567/nand/spinand/scripts/[[factory_boot.es"->"nvmp/target/linux/ssc30x/ssc308/images/spinand/scripts/[[factory_boot.es" in "a594a0fdc3a2a859fb8069da44896ba013432059" CONFLICT (rename/rename): Rename "nvmp/target/linux/nvt98567/nand/spinand/scripts/[[bootloader.es"->"nvmp/target/linux/nvt98567/generic/images/spinand/scripts/[[bootloader.es" in branch "HEAD" rename "nvmp/target/linux/nvt98567/nand/spinand/scripts/[[bootloader.es"->"nvmp/target/linux/ssc30x/ssc308/images/spinand/scripts/[[bootloader.es" in "a594a0fdc3a2a859fb8069da44896ba013432059" CONFLICT (rename/rename): Rename "nvmp/target/linux/nvt98567/nand/spinand/auto_update.txt"->"nvmp/target/linux/nvt98567/generic/images/spinand/auto_update.txt" in branch "HEAD" rename "nvmp/target/linux/nvt98567/nand/spinand/auto_update.txt"->"nvmp/target/linux/AX620Q/ax620q/images/spinand/auto_update.txt" in "a594a0fdc3a2a859fb8069da44896ba013432059" CONFLICT (rename/rename): Rename "nvmp/target/linux/nvt98567/nand/spinand/SPINANDINFO.sni"->"nvmp/target/linux/nvt98567/generic/images/spinand/SPINANDINFO.sni" in branch "HEAD" rename "nvmp/target/linux/nvt98567/nand/spinand/SPINANDINFO.sni"->"nvmp/target/linux/AX620Q/ax620q/images/spinand/SPINANDINFO.sni" in "a594a0fdc3a2a859fb8069da44896ba013432059" CONFLICT (rename/rename): Rename "nvmp/target/linux/nvt98567/nand/SPINAND.INI"->"nvmp/target/linux/nvt98567/generic/images/SPINAND.INI" in branch "HEAD" rename "nvmp/target/linux/nvt98567/nand/SPINAND.INI"->"nvmp/target/linux/AX620Q/ax620q/images/SPINAND.INI" in "a594a0fdc3a2a859fb8069da44896ba013432059" Removing nvmp/target/linux/AX620Q/image/spinand/src/makePartitionIni.c Removing nvmp/target/linux/AX620Q/image/spinand/partitionInfo.ini Auto-merging nvmp/package/mbedtls/patches/201-config.patch CONFLICT (content): Merge conflict in nvmp/package/mbedtls/patches/201-config.patch Auto-merging nvmp/package/mbedtls/Makefile CONFLICT (content): Merge conflict in nvmp/package/mbedtls/Makefile Auto-merging nvmp/package/mbedtls/2.28.4_patches/204-support-dtls-srtp.patch CONFLICT (add/add): Merge conflict in nvmp/package/mbedtls/2.28.4_patches/204-support-dtls-srtp.patch Removing nvmp/package/bluez/patches/only_exchange_mtu.patch Auto-merging nvmp/package/babassl/Makefile CONFLICT (content): Merge conflict in nvmp/package/babassl/Makefile Automatic merge failed; fix conflicts and then commit the result.
09-20
评论
成就一亿技术人!
拼手气红包6.0元
还能输入1000个字符
 
红包 添加红包
表情包 插入表情
 条评论被折叠 查看
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值