Microsoft Windows [版本 6.1.7601]
版权所有 (c) 2009 Microsoft Corporation。保留所有权利。
F:\git>git remote -v
F:\git>git remote add origin http://60.174.211.11:3000/sgp/SPT_Android.git
F:\git>git remote -v
origin http://60.174.211.11:3000/sgp/SPT_Android.git (fetch)
origin http://60.174.211.11:3000/sgp/SPT_Android.git (push)
F:\git>git remote rm origin
F:\git>git remote -v
F:\git>git remote add origin http://60.174.211.11:3000/sgp/SPT_Android.git
F:\git>git remote -v
origin http://60.174.211.11:3000/sgp/SPT_Android.git (fetch)
origin http://60.174.211.11:3000/sgp/SPT_Android.git (push)
F:\git>git pull
remote: Counting objects: 56, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 30 (delta 19), reused 30 (delta 19)
Unpacking objects: 100% (30/30), done.
From http://60.174.211.11:3000/sgp/SPT_Android
-
[new branch] develop -> origin/develop
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.git pull <remote> <branch>
If you wish to set tracking information for this branch you can do so with:
git branch --set-upstream-to=origin/<branch> develop
F:\git>git pull origin develop
From http://60.174.211.11:3000/sgp/SPT_Android
- branch develop -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
local.properties
F:\git>git pull origin deelop
fatal: couldn't find remote ref deelop
F:\git>git pull origin develop
From http://60.174.211.11:3000/sgp/SPT_Android
- branch develop -> FETCH_HEAD
Auto-merging app/build.gradle
Merge made by the 'recursive' strategy.
app/build.gradle | 4 +-
.../sheplive/activity/NewYgsyBeforeActivity.java | 8 +-
.../sheplive/activity/PddGoodDetailActivity.java | 34 +---
.../sheplive/activity/ReturnGoodsListActivity.java | 6 +-
.../sheplive/activity/ShopGoodsDetailActivity.java | 221 +++++++++++----------
.../hpkj/sheplive/contract/AccountContract.java | 10 +
.../com/hpkj/sheplive/entity/PddAuthBindBean.java | 53 +++++
.../com/hpkj/sheplive/fragment/HomeFXFragment.java | 6 +-
.../java/com/hpkj/sheplive/utils/JumpUtil.java | 30 ++-
.../java/com/hpkj/sheplive/utils/PddBindUtil.java | 73 +++++++
.../main/res/layout/activity_new_ygsy_before.xml | 12 +-
app/src/main/res/layout/activity_return_list.xml | 9 +-
.../res/layout/activity_shop_confirm_order.xml | 5 +-
app/src/main/res/layout/home_fx_top.xml | 90 +++++----
14 files changed, 353 insertions(+), 208 deletions(-)
create mode 100644 app/src/main/java/com/hpkj/sheplive/entity/PddAuthBindBean.java
create mode 100644 app/src/main/java/com/hpkj/sheplive/utils/PddBindUtil.java
F:\git>git log -4
commit 17038f67497b94fd4d5ada1f79a846a4f2173c9f (HEAD -> develop)
Merge: 5cfc8685 aff32d4a
Author: sugaoping 323@qq.com
Date: Tue Oct 27 10:00:30 2020 +0800
Merge branch 'develop' of http://60.174.211.11:3000/sgp/SPT_Android into develop
commit 5cfc86854a77228c20859caf57cbc85cc7d8f19a
Author: sugaoping 323@qq.com
Date: Tue Oct 27 09:21:10 2020 +0800
test<E6><96><B0><E5><9C><B0><E5><9D><80>
commit 8dc178f301dc7cc12cd218bcce75bde482d84303
Author: sugaoping 323@qq.com
Date: Mon Oct 26 17:30:07 2020 +0800
<E4><BF><AE><E6><94><B9><E4><BA><AC><E4><B8><9C>title
commit aff32d4a9b75a4dcc22aa497ac5a76fbce2a1a2c (origin/develop)
Author: <E8><83><A1><E5><BB><BA><E6><B0><91> sgp@spshop.cn
Date: Fri Oct 23 18:30:07 2020 +0800
<E3><80><90><E5><A5><A2><E5><93><81><E5><A0><82><E3><80><91>bug<E4><BF><AE><E6><94><B9>
F:\git>git log -4
