git 拉取服务器最新代码并与本地合并

最新推荐文章于 2024-07-29 12:54:36 发布

白鲸入海

最新推荐文章于 2024-07-29 12:54:36 发布

阅读量1.5w

点赞数

分类专栏： git使用

本文链接：https://blog.csdn.net/u012830148/article/details/81479855

版权

git使用专栏收录该内容

16 篇文章 1 订阅

订阅专栏

1.如果本地代码有修改则先将本地的代码做本地提交：git commit -m “change log...”

songchong@srv-pad-compile5:~/3505/ATS350B$ git commit -m "dd"
[ble 777675836a] dd
 23 files changed, 5154 insertions(+), 1576 deletions(-)
 create mode 100644 0001-sample-usb-add-usb-and-multi-ble-manager-func.patch
 create mode 100755 samples/ble_rmc/src/audio_parser.c
 create mode 100755 samples/ble_rmc/src/ble_parser.c
 create mode 100755 samples/ble_rmc/src/bp_meter.c
 create mode 100755 samples/ble_rmc/src/bp_meter.h
 create mode 100755 samples/ble_rmc/src/bt_manager.c
 create mode 100755 samples/ble_rmc/src/bt_manager.h
 delete mode 100755 samples/ble_rmc/src/hid_report_descs.h
 delete mode 100755 samples/ble_rmc/src/hidcore.c
 delete mode 100755 samples/ble_rmc/src/hidcore.h
 create mode 100755 samples/ble_rmc/src/protocol.h
 copy samples/ble_rmc/src/{usb_hid.c => usb_handler.c} (52%)
 create mode 100755 samples/ble_rmc/src/usb_handler.h
 rewrite samples/ble_rmc/src/usb_hid.c (84%)
 mode change 100644 => 100755 subsys/usb/class/hid/Makefile
songchong@srv-pad-compile5:~/3505/ATS350B$ git log -1

2. git fetch orign //拉取服务器上的代码

songchong@srv-pad-compile5:~/3505/ATS350B$ git fetch origin 
remote: Counting objects: 2004, done
remote: Finding sources: 100% (1489/1489)
remote: Total 1489 (delta 1016), reused 1440 (delta 1016)
Receiving objects: 100% (1489/1489), 3.04 MiB | 0 bytes/s, done.
Resolving deltas: 100% (1016/1016), completed with 314 local objects.
From ssh://192.168.4.4:29418/ZH/actions/ATS350B
   59e04cbc14..443058662e  gl5118b_dev_v1.9               -> origin/gl5118b_dev_v1.9
   ae64960462..0c7298c5eb  gl5118b_dev_v1.9_patch         -> origin/gl5118b_dev_v1.9_patch
   28553556d5..76e65dda83  tb_gl5118b_dev_v1.9_ble        -> origin/tb_gl5118b_dev_v1.9_ble
   9720568379..7ae9d174de  tb_gl5118b_dev_v1.9_for_duoshi -> origin/tb_gl5118b_dev_v1.9_for_duoshi
   49d0530cf8..a4c84159cd  tb_gl6151_dev                  -> origin/tb_gl6151_dev
 * [new tag]               TAG_ZS350B_1900_180720         -> TAG_ZS350B_1900_180720
 * [new tag]               TAG_ZS350B_1900_180727         -> TAG_ZS350B_1900_180727
songchong@srv-pad-compile5:~/3505/ATS350B$

3.git branch -a //查看全部分支

songchong@srv-pad-compile5:~/3505/ATS350B$ git branch -a
* ble
  remotes/origin/gl5118b_dev_v1.9
  remotes/origin/gl5118b_dev_v1.9_patch
  remotes/origin/tb_gl5118b_dev_v1.9_ble
  remotes/origin/tb_gl5118b_dev_v1.9_for_duoshi
  remotes/origin/tb_gl6151_dev
  remotes/origin/tb_minisdk_for_lexin
  remotes/origin/upstream_master
  remotes/origin/upstream_v1.9

4. git rebase remotes/origin/tb_gl5118b_dev_v1.9_ble //将拉取的代码合并到本地

songchong@srv-pad-compile5:~/3505/ATS350B$ git rebase remotes/origin/tb_gl5118b_dev_v1.9_ble
First, rewinding head to replay your work on top of it...
Applying: dd
Using index info to reconstruct a base tree...
M       subsys/usb/class/hid/Makefile
.git/rebase-apply/patch:88: trailing whitespace.
+                               u8_t *vendor_data);
.git/rebase-apply/patch:142: trailing whitespace.
 
.git/rebase-apply/patch:147: trailing whitespace.
 
.git/rebase-apply/patch:151: trailing whitespace.
 
.git/rebase-apply/patch:161: trailing whitespace.
+obj-y += main.o conn_manager.o rmc_timer.o audio_parser.o ble_parser.o usb_handler.o bt_manager.o bp_meter.o 
warning: squelched 1378 whitespace errors
warning: 1383 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging subsys/usb/class/hid/Makefile
Auto-merging samples/ble_rmc/src/usb_handler.c
Removing samples/ble_rmc/src/hidcore.h
Removing samples/ble_rmc/src/hidcore.c
songchong@srv-pad-compile5:~/3505/ATS350B$ 
songchong@srv-pad-compile5:~/3505/ATS350B$ 
songchong@srv-pad-compile5:~/3505/ATS350B$ git status
On branch ble
nothing to commit, working tree clean