方式一 (远程代码下载到本地新建分支;对比区别后在合并)
- 查看远程分支
git remote -v
$ git remote -v
origin https://github.com/shangsheng/uni-myMusic.git (fetch)
origin https://github.com/shangsheng/uni-myMusic.git (push)
从上面的结果可以看出,远程仓库有一个是origin
2.从远程获取最新版本到本地
git fetch origin dev:temp
$ git fetch origin dev:temp
remote: Enumerating objects: 24, done.
remote: Counting objects: 100% (24/24), done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 13 (delta 6), reused 13 (delta 6), pack-reused 0
Unpacking objects: 100% (13/13), done.
From https://github.com/shangsheng/uni-myMusic
* [new branch] dev -> temp
155cc23..c54244c dev -> origin/dev
git fetch origin dev:temp 这句命令的意思是:从远程的origin仓库的dev分支下载到本地并新建一个分支temp
- 比较本地的仓库和远程参考的区别
git diff temp
$ git diff temp
diff --git a/common/iocnfont.css b/common/iocnfont.css
index de63817..781586e 100644
--- a/common/iocnfont.css
+++ b/common/iocnfont.css
@@ -1,10 +1,10 @@
@font-face {font-family: "iconfont";
- src: url('//at.alicdn.com/t/font_2286010_se5nlzaqkm8.eot?t=1611197261002'); /* IE9 */
- src: url('//at.alicdn.com/t/font_2286010_se5nlzaqkm8.eot?t=1611197261002#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAA8cAAsAAAAAG2wAAA7NAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCGXgqjLJxKATYCJANsCzgABCAFhG0HgncbCRcz0nLSihnZ/wEygVs9QFJX4x7bYoRXUcRqGFDgkbXnjsGBBE2TQOIDWgAAngJAAwCggS9ABU7gOD/4uuO1HaFlwDEHjHgRwFBK+Odbe71vZnY/ECQlRFWF4Cocga5iRbYnqq5CAcqEXYkWGXJtlxQTwhgDbuRFoWUi3N23X4qBZBRYW6INT9vq38zQQw1lYeGJEUVbGPhhsHCLMDYbvPSDVbDV3J2b5Ua0uO5F661XRQNSGyuct+01aZ3fTpGJyEn0qAJUXGbkmlyFXzX+TCQJe4Xv59ZdLRZBuuYZYhXu3Qk2+W6XU81euKcumDlYF580p8iv4ZMlnyxl8TJchMq7ActP+9WqW7p2BwzeLkQ8tpk/ZyMnb30W078+iFiCeolMpNv67Om/Q1RChEqnVXKkd2xb5Wj7XPAug+zxN+WSmoQaohk8TBPY39ZbQ0CUpqm0dv0pGxSH4MJup09UFIEG3LiEZhEe8CVjOnQbj7C5Ym4Tblm/XmM0FDB4FmHcefRwKdgg+C8r4EB5uVyeAnZjgQWmAgemKN2oNNZhUy0Rle3r6CdM1GZfIzyINB/+goWKk09jtg/ZbTXit6GS2bfrfwYBg0jJ8yMtVsWpCyUmmnMmm2n2ouanhKKKODlV/bDLEvg7k6EgQhIRIy9D/+cRoiSFwyML+fBd4wDaiEgVgzwXoojB1EJUMJheiDgM5hcih8ECzSeL4NBkCYCFrAAoQ1YBJCBbAHzIDoAo5DQABnI5OHXIHQAikDsBJCF3ARDkQQAxyIsA8pBXAWQg7wIIQz4DEIL8joUoYegQkLLkVQAO8hEUHmusCweQBVDDGPPBTuIdJ6HDiLpX7Cg8whhT+Cvfeiof8xZWgsHCF8u0+DZh6gnVkmr4qGyjmtbfJsUZyUZCmKjM5iUQkEhnlyLAdyieymnj8aUNsqgsEAgRgvHu1Cpy6fRGk89gp
命令的意思是:比较dev分支和temp分支的不同
- 合并temp分支到dev分支
git merge temp
$ git merge temp
Updating 155cc23..c54244c
Fast-forward
common/iocnfont.css | 24 +++-
common/uni-change.css | 4 +
pages/secondaryPage/playlist/playlist.vue | 6 +-
pages/secondaryPage/songDetails/songDetails.vue | 34 +++++-
pages/template/playing_list.vue | 147 ++++++++++++++++++++++++
5 files changed, 205 insertions(+), 10 deletions(-)
create mode 100644 pages/template/playing_list.vue
- 如果不想要temp分支了,可以删除此分支
$ git branch -d temp
Deleted branch temp (was c54244c).
方式二 (远程代码直接下载合并到本地)
- 查看远程分支,和上面的第一步相同
git remote -v - 从远程获取最新版本到本地
git fetch origin master
$ git fetch origin master
From https://github.com/shangsheng/uni-myMusic
* branch master -> FETCH_HEAD
2ec5295..98d9ace master -> origin/master
- 比较本地的仓库和远程参考的区别
git log -p master… origin/master
$ git log -p master.. origin/master
commit 98d9ace3c0ccdfaf4872a851c09f361e064bbe30 (origin/master)
Date: Thu Dec 24 15:53:08 2020 +0800
首页模块音乐日历以及专属场景歌单
diff --git a/common/iocnfont.css b/common/iocnfont.css
index 0624283..17cc7d4 100644
--- a/common/iocnfont.css
+++ b/common/iocnfont.css
@@ -1,10 +1,10 @@
@font-face {font-family: "iconfont";
- src: url('//at.alicdn.com/t/font_2286010_r4ie67ce7p.eot?t=1608710949770'); /* IE9 */
- src: url('//at.alicdn.com/t/font_2286010_r4ie67ce7p.eot?t=1608710949770#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAM8AAsAAAAAB0gAAALtAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDHAqCBIFqATYCJAMQCwoABCAFhG0HRRtZBsgehXFj3axcSpSF7eMKnj458s/unIUKjokqL2V6VVIJlekOl2v5AGB35iWwekVFtoebHOcAjS/YugrbGtfgPric/ijLHqR1luU21qK9KBoTMLA0sLEmbeECyb1h7CYCh7AZArgSSTpSf3bzkiqhgF4CyAKVCqlSzoGiVtgZwbFmoiJHcMDZ7DUvgcP8+/KHXHEGg4MFDOyedSqndt+b30PslsktDFEE3nxmwJoGFkgHFGRObWAaWcQiLK7NcxQCzjhjYK66gO8hk5NSDzvmQBuY0X+eOAJS3QHIV4MWvnthFgx8D5BQJwtR+S+QoQA480ZJjaToBVDCOcYgGG/vTjs7v7LvTrCevevmtv++OGy955En0C3vC3M4d2/9jN93mffE4fLrov0pM//epp+ZfiLwlIx+BZ0OWPpxxn/J+4nRIboZa+rsMdfMHt+m7h6/a1j+nMv96hag2Gf8X1R43zzmErWkc
- 把远程下载下来的代码合并到本地仓库,远程的和本地的合并
git merge origin/master
$ git merge origin/master
Updating 2ec5295..98d9ace
Fast-forward
App.vue | 1 +
common/api.js | 1039 ++
common/iocnfont.css | 36 +
common/plugInUnit.js | 92 +
common/uni-change.css | 32 +
common/util.js | 32 +-
components/vear-carousel/vear-carousel.vue | 124 +
js_sdk/luch-request/luch-request/adapters/index.js | 88 +
.../luch-request/core/InterceptorManager.js | 51 +
js_sdk/luch-request/luch-request/core/Request.js | 199 +
.../luch-request/core/buildFullPath.js | 20 +
js_sdk/luch-request/luch-request/core/defaults.js | 30 +
.../luch-request/core/dispatchRequest.js | 6 +
.../luch-request/luch-request/core/mergeConfig.js | 89 +
js_sdk/luch-request/luch-request/core/settle.js | 16 +
.../luch-request/luch-request/helpers/buildURL.js | 69 +
.../luch-request/helpers/combineURLs.js | 14 +
.../luch-request/helpers/isAbsoluteURL.js | 14 +
js_sdk/luch-request/luch-request/index.js | 2 +
js_sdk/luch-request/luch-request/utils.js | 131 +
main.js | 6 +
manifest.json | 31 +-
pages/tabBar/home/home.vue | 195 +-
pages/template/drawerMenu.vue | 5 +-
pages/template/homeBlock.vue | 393 +
.../dev/.sourcemap/mp-weixin/common/main.js.map | 2 +-
.../dev/.sourcemap/mp-weixin/common/runtime.js.map | 2 +-
.../dev/.sourcemap/mp-weixin/common/vendor.js.map | 2 +-
.../components/uni-drawer/uni-drawer.js.map | 2 +-
.../components/uni-icons/uni-icons.js.map | 2 +-
.../uni-search-bar/uni-search-bar.js.map | 2 +-
.../uni-swiper-dot/uni-swiper-dot.js.map | 2 +-
.../mp-weixin/components/uni-tag/uni-tag.js.map | 2 +-
.../mp-weixin/pages/tabBar/home/home.js.map | 2 +-
.../mp-weixin/pages/template/drawerMenu.js.map | 2 +-
.../mp-weixin/pages/template/homeBlock.js.map | 1 +
unpackage/dist/dev/mp-weixin/app.json | 2 +-
unpackage/dist/dev/mp-weixin/common/main.js | 8 +-
unpackage/dist/dev/mp-weixin/common/main.wxss | 94 +
unpackage/dist/dev/mp-weixin/common/runtime.js | 4 +-
unpackage/dist/dev/mp-weixin/common/vendor.js | 16461 +++++++++++--------
.../mp-weixin/components/uni-drawer/uni-drawer.js | 28 +-
.../mp-weixin/components/uni-icons/uni-icons.js | 30 +-
.../components/uni-search-bar/uni-search-bar.js | 32 +-
.../components/uni-swiper-dot/uni-swiper-dot.js | 267 +
.../components/uni-swiper-dot/uni-swiper-dot.json | 4 +
.../components/uni-swiper-dot/uni-swiper-dot.wxml | 1 +
.../components/uni-swiper-dot/uni-swiper-dot.wxss | 112 +
.../dev/mp-weixin/components/uni-tag/uni-tag.js | 240 +
.../dev/mp-weixin/components/uni-tag/uni-tag.json | 4 +
.../dev/mp-weixin/components/uni-tag/uni-tag.wxml | 1 +
.../dev/mp-weixin/components/uni-tag/uni-tag.wxss | 131 +
.../dist/dev/mp-weixin/pages/tabBar/Blog/blog.js | 24 +-
.../dev/mp-weixin/pages/tabBar/Karaoke/Karaoke.js | 24 +-
.../dist/dev/mp-weixin/pages/tabBar/home/home.js | 234 +-
.../dist/dev/mp-weixin/pages/tabBar/home/home.json | 4 +-
.../dist/dev/mp-weixin/pages/tabBar/home/home.wxml | 2 +-
.../dist/dev/mp-weixin/pages/tabBar/home/home.wxss | 80 +-
unpackage/dist/dev/mp-weixin/pages/tabBar/my/my.js | 24 +-
.../dev/mp-weixin/pages/tabBar/yuncun/yuncun.js | 24 +-
.../dev/mp-weixin/pages/template/drawerMenu.js | 57 +-
.../dev/mp-weixin/pages/template/drawerMenu.wxss | 30 +
.../dist/dev/mp-weixin/pages/template/homeBlock.js | 455 +
.../dev/mp-weixin/pages/template/homeBlock.json | 6 +
.../dev/mp-weixin/pages/template/homeBlock.wxml | 1 +
.../dev/mp-weixin/pages/template/homeBlock.wxss | 300 +
unpackage/dist/dev/mp-weixin/sitemap56.json | 7 +
unpackage/dist/dev/mp-weixin/sitemap80.json | 7 +
unpackage/dist/dev/mp-weixin/sitemap91.json | 7 +
69 files changed, 14082 insertions(+), 7359 deletions(-)
create mode 100644 common/api.js
create mode 100644 common/iocnfont.css
create mode 100644 common/plugInUnit.js
create mode 100644 components/vear-carousel/vear-carousel.vue
create mode 100644 js_sdk/luch-request/luch-request/adapters/index.js
create mode 100644 js_sdk/luch-request/luch-request/core/InterceptorManager.js
create mode 100644 js_sdk/luch-request/luch-request/core/Request.js
create mode 100644 js_sdk/luch-request/luch-request/core/buildFullPath.js
create mode 100644 js_sdk/luch-request/luch-request/core/defaults.js
create mode 100644 js_sdk/luch-request/luch-request/core/dispatchRequest.js
create mode 100644 js_sdk/luch-request/luch-request/core/mergeConfig.js
create mode 100644 js_sdk/luch-request/luch-request/core/settle.js
create mode 100644 js_sdk/luch-request/luch-request/helpers/buildURL.js
create mode 100644 js_sdk/luch-request/luch-request/helpers/combineURLs.js
create mode 100644 js_sdk/luch-request/luch-request/helpers/isAbsoluteURL.js
create mode 100644 js_sdk/luch-request/luch-request/index.js
create mode 100644 js_sdk/luch-request/luch-request/utils.js
create mode 100644 pages/template/homeBlock.vue
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/template/homeBlock.js.map
create mode 100644 unpackage/dist/dev/mp-weixin/components/uni-swiper-dot/uni-swiper-dot.js
create mode 100644 unpackage/dist/dev/mp-weixin/components/uni-swiper-dot/uni-swiper-dot.json
create mode 100644 unpackage/dist/dev/mp-weixin/components/uni-swiper-dot/uni-swiper-dot.wxml
create mode 100644 unpackage/dist/dev/mp-weixin/components/uni-swiper-dot/uni-swiper-dot.wxss
create mode 100644 unpackage/dist/dev/mp-weixin/components/uni-tag/uni-tag.js
create mode 100644 unpackage/dist/dev/mp-weixin/components/uni-tag/uni-tag.json
create mode 100644 unpackage/dist/dev/mp-weixin/components/uni-tag/uni-tag.wxml
create mode 100644 unpackage/dist/dev/mp-weixin/components/uni-tag/uni-tag.wxss
create mode 100644 unpackage/dist/dev/mp-weixin/pages/template/drawerMenu.wxss
create mode 100644 unpackage/dist/dev/mp-weixin/pages/template/homeBlock.js
create mode 100644 unpackage/dist/dev/mp-weixin/pages/template/homeBlock.json
create mode 100644 unpackage/dist/dev/mp-weixin/pages/template/homeBlock.wxml
create mode 100644 unpackage/dist/dev/mp-weixin/pages/template/homeBlock.wxss
create mode 100644 unpackage/dist/dev/mp-weixin/sitemap56.json
create mode 100644 unpackage/dist/dev/mp-weixin/sitemap80.json
create mode 100644 unpackage/dist/dev/mp-weixin/sitemap91.json
总结:方式一更好理解,更安全,对于pull也可以更新代码到本地,相当于fetch+merge,多人写作的话不够安全。