$ git branch
* G52840
OS
master
$ git switch master
$ git merge OS
Removing examples/ble_peripheral/ble_app_hrs_freertos/pca10056/s140/arm5_no_packs/ble_app_hrs_freertos_pca10056_s140.uvoptx
Merge made by the 'recursive' strategy.
.gitignore | 4 +-
此时https://blog.csdn.net/qq_41396714/article/details/103969733
shift + :
q
enter
$ git branch -d OS
完成分支合并
$ git branch
G52840
* master
$ git merge G52840
Auto-merging components/boards/pca10056.h
CONFLICT (content): Merge conflict in components/boards/pca10056.h
Automatic merge failed; fix conflicts and then commit the result.
此时失败 去路径 打开文件 显示如下
修改
$ git add examples/ble_peripheral/ble_app_blinky/pca10056/s140/config/launchiot.h
laiying-zhou@DESKTOP-TEN5UA5 MINGW64 /d/xwatch (master|MERGING)
$ git commit -m "分支合并-修改此文件"
[master 93f8153] 分支合并-修改此文件
laiying-zhou@DESKTOP-TEN5UA5 MINGW64 /d/xwatch (master)
$ git merge G52840
Already up to date.
git push origin master