从远程仓库拉下来的代码,如果不管和源端的差别大,怎么进行同步呢
流程如下:
1. 在github网站上将别人的仓库fork到自己名下
2. git clone 自己仓库名下的分支
3. git add remote 给源仓库设置名称(upstream)
5. git fetch upst 获取别人的仓库
6. gi tmerge 和自己本地的进行合并
仓库的frok和clone
#创建一个目录
$ pwd
/c/Users/Administrator/first-pr
Administrator@YOUNG-PC MINGW64 ~/first-pr (work)
$ mkdir ../newfirst-pr
Administrator@YOUNG-PC MINGW64 ~/first-pr (work)
$ cd ../newfirst-pr/
Administrator@YOUNG-PC MINGW64 ~/newfirst-pr
$ #新建立一个目录后,clone自己fork过来的仓库
Administrator@YOUNG-PC MINGW64 ~/newfirst-pr
$ git clone git@github.com:x695/first-pr.git
Cloning into 'first-pr'...
remote: Counting objects: 1003, done.
remote: Compressing objects: 100% (25/25), done.
Receriveimnogt eo:b jTeocttasl: 1 09093% ((d9e9l3t/a1 01043)),, r2e2u8s.e0d1 0K i(Bd e|l t2a0 .00)0, KpiaBc/ks-r e u ed 978
Receiving objects: 100% (1003/1003), 235.21 KiB | 20.00 KiB/s, done.
Resolving deltas: 100% (643/643), done.
Checking connectivity... done.
Administrator@YOUNG-PC MINGW64 ~/newfirst-pr
$ cd first-pr/
Administrator@YOUNG-PC MINGW64 ~/newfirst-pr/first-pr (gh-pages)
#给原仓库设置名称
$ git remote add upstream git@github.com:ituring/first-pr.git
Administrator@YOUNG-PC MINGW64 ~/newfirst-pr/first-pr (gh-pages)
#进行fetch
$ git fetch upstream
From github.com:ituring/first-pr
* [new branch] feature/move-jquery-from-cdn-to-local -> upstream/feature/move-jquery-from-cdn-to-local
* [new branch] gh-pages -> upstream/gh-pages
Administrator@YOUNG-PC MINGW64 ~/newfirst-pr/first-pr (gh-pages)
#进行merge
$ git merge upstream/gh-pages
Already up-to-date.
Administrator@YOUNG-PC MINGW64 ~/newfirst-pr/first-pr (gh-pages)
$