git用法整理

最新推荐文章于 2023-12-25 20:03:37 发布

被刮花De豹纹

最新推荐文章于 2023-12-25 20:03:37 发布

阅读量149

点赞数

本文链接：https://blog.csdn.net/qq_27983273/article/details/85268722

版权

仓库关系
本地仓库——origin（fork）——upstream(码云)
命令进行
git remote -v 查询远端分支

casstime@DESKTOP-U864Q9M MINGW64 /d/interface_test/develop (develop)
$ git fetch upstream
remote: Enumerating objects: 71, done.
remote: Counting objects: 100% (54/54), done.
remote: Compressing objects: 100% (32/32), done.
remote: Total 32 (delta 25), reused 0 (delta 0)
Unpacking objects: 100% (32/32), done.
From gitee.com:cass-test/Cass_interface_test
   db8d741..1e40f84  develop    -> upstream/develop

校验是否有更新，没有更新没有“db8d741…1e40f84 develop -> upstream/develop”

casstime@DESKTOP-U864Q9M MINGW64 /d/interface_test/develop (develop)
$ git add .

casstime@DESKTOP-U864Q9M MINGW64 /d/interface_test/develop (develop)
$ git commit -m'hh'
On branch develop
nothing to commit, working tree clean

casstime@DESKTOP-U864Q9M MINGW64 /d/interface_test/develop (develop)
$ git fetch upstream

casstime@DESKTOP-U864Q9M MINGW64 /d/interface_test/develop (develop)
$ git merge upstream/develop
Merge made by the 'recursive' strategy.
 cases/Member/Address_Service_sta.py                |  28 +-
 cases/Member/CompanyLevel_sta.py                   | 164 ++++++++++++
 cases/Merchant/BiServic_data_of_service_sta.py     |   2 +-
 ...rchantService_pinkage_PinkageItemService_sta.py |  12 +-
 cases/Order/get_cart_item_count_sta.py             |  57 ++++
 cases/Order/inquiry_cart_settle_sta.py             | 138 ++++++++++
 cases/Order/inquiry_cart_sta.py                    | 298 +++++++++++++++++++++
 cases/Settlement/generate_transaction_flow_sta.py  |  32 +--
 ...roduct_getPriceAndInventory_by_productId_sta.py |   3 +-
 data/MerchantService/pinkage_data.csv              | 110 ++++----
 data/Order/inquiry_cart_add.csv                    |   6 +
 data/global_values.py                              |   1 +
 public/member/function.py                          |  11 +
 13 files changed, 772 insertions(+), 90 deletions(-)
 create mode 100644 cases/Member/CompanyLevel_sta.py
 create mode 100644 cases/Order/get_cart_item_count_sta.py
 create mode 100644 cases/Order/inquiry_cart_settle_sta.py
 create mode 100644 cases/Order/inquiry_cart_sta.py
 create mode 100644 data/Order/inquiry_cart_add.csv

casstime@DESKTOP-U864Q9M MINGW64 /d/interface_test/develop (develop)
$ git push origin develop
Counting objects: 95, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (59/59), done.
Writing objects: 100% (95/95), 18.95 KiB | 1.72 MiB/s, done.
Total 95 (delta 68), reused 53 (delta 36)
remote: Powered By Gitee.com
To gitee.com:cass-charban/Cass_interface_test.git
   7e06c6b..c192f30  develop -> develop

过程中进入编辑器直接退出即可