git: 远程仓库和本地仓库

内容协调

只进行一次克隆即可

仓库抓取：fetch

fengxuewei@fengxuewei-Legion-Y7000-2019-PG0:~/gitTest02/git_test$ git fetch 
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 2 (delta 1), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (2/2), done.
From gitee.com:fengxuewei-dev/git_test
   80fca34..f5c09da  master     -> origin/master
fengxuewei@fengxuewei-Legion-Y7000-2019-PG0:~/gitTest02/git_test$ git-log
* f5c09da (origin/master, origin/HEAD) add file04.txt   # 显示的分支是 origin/master ,只是将这个文件从远程仓库抓取到本地，但是还没有进行合并 下面进行 merge
*   80fca34 (HEAD -> master) Merge branch 'dev'
|\  
| * 362870e file.txt count = dev
* | 645d062 master counter
|/  
*   05dcb61 practic the git command so that merge branch 'dev02'
|\  
| * 4455abc hello
* | 3ee6459 add filllle.md
* | dbc563f add file03.txt
|/  
* 1ad2797 ignore
* 688c6d1 add file

fengxuewei@fengxuewei-Legion-Y7000-2019-PG0:~/gitTest02/git_test$ git merge origin/master
Updating 80fca34..f5c09da
Fast-forward
 file04.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 file04.txt
fengxuewei@fengxuewei-Legion-Y7000-2019-PG0:~/gitTest02/git_test$ git-log
* f5c09da (HEAD -> master, origin/master, origin/HEAD) add file04.txt
*   80fca34 Merge branch 'dev'
|\  
| * 362870e file.txt count = dev
* | 645d062 master counter
|/  
*   05dcb61 practic the git command so that merge branch 'dev02'
|\  
| * 4455abc hello
* | 3ee6459 add filllle.md
* | dbc563f add file03.txt
|/  
* 1ad2797 ignore
* 688c6d1 add file

git pull

git fetch + merge

解决合并冲突

本地更改的
远程仓库更改的

二者不一样，在pull 之后，会不知道以哪一个为主，这个时候解决办法和本地仓库 merge 是一样的

git filter-branch --tree-filter ‘rm -rf logs/*’ HEAD