Git-Debug 回退分支查找问题

最新推荐文章于 2025-12-22 21:05:29 发布
原创 最新推荐文章于 2025-12-22 21:05:29 发布 · 467 阅读 · 0 ·
CC 4.0 BY-SA版权
版权声明：本文为博主原创文章，遵循 CC 4.0 BY-SA 版权协议，转载请附上原文出处链接和本声明。
文章标签：

#git

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

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

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

Dongo2
关注
Debug-019-git reflog的两种使用场景
LM0916的博客
07-31 1206
中的一个文件，用来跟踪每个分支的本地提交。偶尔我们需要使用git reset 回退版本的时候，假如我们前一步没有使用git log查看提交，又如果我们关闭了git命令行，又如果我们之前也并没有推送远程分支留有备份的的话，这些都没有做的话，那我们是可以使用git reflog查看找到当前分支回退之前的版本，只要找到那个哈希值，那么使用git reset就可以回退到之前的版本（以前我认为git reset只能回退到以前的某个版本，实际上你只要有对应的版本号-哈希值，那么你可以任意穿梭）
git 常用命令
u013268445的专栏
11-20 9463
git 常用命令汇总
git-config Manual Page（机翻版）
Passerby_Wang的博客
11-03 1390
Git-config手册页 名称 git-config-获取并设置存储库或全局选项 SYNOPSIS Git config[-type=][-fixed-value][-show-resource][-name-gz]value[-show-scope][-show-value[value-pattern]][-type=]-fplace-all name value[]git-pattern[][-type=][-style=][-fixed-value][-pattern]][-value-or
Git 不常用到的命令（看懂这个 git 你就懂了)-6
qq_24907431的博客
03-24 1176
重置位置的同时，只保留 working tree 工作区的內容，但会将 index 暂存区 和 repository 中的內容更改和 reset 目标节点一致，因此原节点和 reset 节点之间的。：重置位置的同时，保留 working tree 工作区和 index 暂存区的内容，只让 repository 中的内容和 reset 目标节点保持一致。因此原节点和 reset 节点之间的。也就是说，工作目录的修改、暂存区的内容以及由 reset 所导致的新的文件差异，都会被放进工作目录。
Git使用流程及技巧 - 详细教程
NSJim的博客
08-01 6351
本篇文章以GitHub为例，系统为Windows系统。内容详细，包含各种初学者可能会遇到的问题和解决方案。既适合初学者，也适合有一定基础的用户。 文章内容为：本地库及远程库使用流程，设置多个SSH key，局域网内搭建Git远程仓库，合并冲突，减少冲突，撤销更改，版本回退，设置忽略规则（配置gitignore文件），配置gitattributes文件，使用rebase合并分支，IDE集成Git的使用流程，提升SSH传输速度，解决Git Bash命令行的中文乱码问题，解决换行符的替换问题，等等。
git实战探索---命令总结（二）
xiangfengweixiaojie的博客
01-12 431
git命令总结git安装，创建版本库时光机穿梭版本回退工作区和暂存区管理修改撤销修改删除文件远程仓库添加远程库从远程库克隆分支管理创建与合并分支解决冲突分支管理策略Bug分支feature分支多人协作Rebase git安装，创建版本库 首先，你可以试着输入git，看看系统有没有安装Git，没有安装通过 apt-get install git就可以直接完成Git的安装， 安装完成后，还需要最后一步设置，在命令行输入： $ git config --global user.name "Your Name" $
【Git】深入学习
小管打天下的博客
09-03 1216
远程仓库（Remote Respository）之前的操作都是基于本地仓库，别人无法拿到，要想别人拿到就得把代码共享到远程仓库我们可以通过第三方的Git服务器，比如：Github，Gitee，Gitlab等，来搭建我们的 Git 服务Gitee 和 GitLab 公司采用的比较多，而 GitHub 一般用来做开源项目，协议一般用MITgit add .git pull => git fetch + git merge（拿最新的代码合并）git push。
【Git 笔记】Git 入门笔记
高厉害 0w0
07-23 556
ContentGit常用命令开始使用 GitGit 的发展分布式版本控制系统Git 下载设置个人信息创建仓库（版本库）添加文件创建文件提交`commit`跨平台的问题版本管理回滚版本打印日志版本回退恢复到指定版本工作区和暂存区撤销修改放弃工作区的修改时间节点放弃暂存区的修改推荐使用`restore`删除文件方法一方法二远程仓库推送到 GitHubSSH 秘钥使用 SSH 协议连接到 GitHub创建 SSH 秘钥在 GitHub 关联公钥在本地关联私钥（选）其他从远程库克隆分支管理创建与合并分支合并冲突留下
git_命令总结
Jun_P的博客
08-20 543
git 命令总结
Linux基础工具之git
ZZY5707的博客
10-07 391
我们说git是一个版本控制系统，那么该自己理解版本控制这个概念呢？版本控制（Version Control）是一种记录和管理文件或项目的不同版本的系统。它可以追踪文件的变化，并允许开发者在不同的时间点回溯、比较和恢复文件的特定版本。理解版本控制的重要性和好处有以下几个方面：历史记录：版本控制系统可以记录每个文件的修改历史，包括谁做了什么修改、何时进行的修改等。这样开发者可以轻松地查看项目的演变历程，了解每个版本的变化和改进。
版本控制与ESP32协同开发：Git工程结构设计与分支管理最佳实践
![版本控制与ESP32协同开发：Git工程结构设计与分支管理最佳实践]...然而，嵌入式开发特有的硬件依赖性、固件构建产物庞大、多环境交叉编译等问题，使得通用的Git工作流难以直接
固件升级反坑记：从ESP-IDF v4.x到v5.0共存问题回退的4个关键教训
# 1. 固件升级的背景与挑战概述 随着物联网设备规模化部署，固件升级已从开发后期环节演变为全生命周期管理的核心命题。尤其在ESP32系列芯片广泛应用的背景下，SDK频繁迭代带来功能增强的同时，也引入了版本兼容性...
github 类似 开源网站
q610098308的专栏
12-20 1418
本文整理了国内外主流代码托管平台，分为全球知名平台（GitLab、Bitbucket等）、国内优秀平台（Gitee、腾讯云Coding等）和特色平台（Radicle、Codeberg等）。建议个人项目首选GitHub或Gitee，企业项目可选GitLab或云厂商平台，注重隐私可自建Gitea。选择时需考虑团队规模、DevOps需求、访问速度和合规要求等因素。
git临时保存工作区和暂存区的修改，以便在需要时恢复。它常用于切换分支、紧急修复或尝试不同方案时保留当前进度
小夏同学呀
12-19 264
git stash 命令用于临时保存工作区和暂存区的修改，以便在需要时恢复。它常用于切换分支、紧急修复或尝试不同方案时保留当前进度。‌git stash如果需要包含未跟踪的文件（如新创建的文件），可使用 -u 参数；包含所有文件（包括被忽略的）则使用 -a(-a 或 --all：除了未跟踪的文件外，还会将忽略文件（.gitignore 文件中列出的文件）保存到 stash 中。
andirod studio中的git历史记录插件
最新发布
前端金牌摸鱼达人
12-22 264
andirod studio中的git历史记录插件
Git Rebase 的全面指南
不怕麻烦的鹿丸的博客
12-18 801
Git rebase 是一个强大的工具，用于重写提交历史、整理分支和优化工作流。它通过将提交“移动”到另一个基点来创建更线性的历史，避免不必要的合并提交。正确使用 rebase 可以使代码库更整洁，但操作不当可能导致问题。本文将系统讲解 所有 git rebase 的用法，每个用法都提供详细代码示例，帮助您全面掌握。重点内容包括：不要 rebase 已发布的提交（避免团队冲突）、交互式编辑（精细控制历史）和冲突解决（确保操作成功）。
Centos7安装Git环境
Asurplus
12-22 270
Git是一个免费开源的分布式版本控制系统（DVCS），由Linus Torvalds于2005年创建，用于高效管理项目版本历史，支持从个人到大规模团队的协作开发。
不小心执行了 git revert，如何恢复到被撤销前的状态
m0_58528895的博客
12-20 283
误执行git revert后恢复原状的方法分两种情况：1）本地未推送时，用git reset --hard HEAD^回退到撤销前状态；2）已推送时，用git revert 撤销提交哈希再次撤销该操作，然后推送。核心思路是通过撤销操作来恢复原提交，保留完整操作记录。操作后可用git log验证，也可用图形化工具完成。关键是根据是否推送选择不同恢复方式，确保代码库安全。
windows使用gitea迁移仓库
weixin_46430763的博客
12-18 197
1. 记录访问呢。
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
# 强制回退到远程状态 git reset --hard origin/develop_sz0519 # 清理未跟踪文件（可选） git clean -fd ``` ✅ 这样你就拥有了干净、最新的代码，不会再有编译接口不匹配的问题。 --- ## ✅ 方案 B：保留本地...
评论
成就一亿技术人!
拼手气红包6.0元
还能输入1000个字符
 
红包 添加红包
表情包 插入表情
表情包 代码片
 条评论被折叠 查看
添加红包

请填写红包祝福语或标题

个

红包个数最小为10个

元

红包金额最低5元

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

抵扣说明：

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

余额充值