git cherry-pick (28)

1.1 目的

本文档用于说明如何git上,通过cherry-pick命令合并某个功能。

将分支bg_device的 +AHB New feature support libalgo arm64 lib 提交内容合并至
分支spfl_device 分支当中

1.2适配步骤

1.2.1 实操过程

==> 分支sfpl_device的状态

rootx@rootx-ThinkPad:~/workdir/env/vscode/tmp/cmake_msgcore_project/build$ git log -1
commit 098ded4cc4cc401ab85d5b75783325142a60ee8f (origin/spfl_device)
Author: candies <36974633+13701761349@users.noreply.github.com>
Date:   Tue May 13 15:07:59 2025 +0800+AHB New feature support dump spfl status info

==> 分支bg_device的状态

commit 885e47a7a8a998cd8eb5b7be292851f272ba536f
Author: candies <36974633+13701761349@users.noreply.github.com>
Date:   Fri May 16 14:14:10 2025 +0800+AHB New feature support libalgo arm64 lib

==> 切换至spfl_device分支当中

#git chekcout sfpl_device

==> 执行合并

#git cherry-pick 885e47a7a8a998cd8eb5b7be292851f272ba536f

==> 解决冲突

#vim resource/DataAcquisitionFSM.cpp 
#git add resource/DataAcquisitionFSM.cpp
#git cherry-pick --continue

==> 当前spfl_device分支的状态

rootx@rootx-ThinkPad:~/workdir/env/vscode/tmp/cmake_msgcore_project/build$ git log -2
commit 5bbb61039709f748a8535bd718c078a310e90367 (HEAD -> spfl_device)
Author: candies <36974633+13701761349@users.noreply.github.com>
Date:   Fri May 16 14:14:10 2025 +0800+AHB New feature support libalgo arm64 lib   =====>已合并成功commit 098ded4cc4cc401ab85d5b75783325142a60ee8f (origin/spfl_device)
Author: candies <36974633+13701761349@users.noreply.github.com>
Date:   Tue May 13 15:07:59 2025 +0800+AHB New feature support dump spfl status info

1.2.2 总结

这样的操作方法比通过beyond compare来合并代码效率更高。