git示例3

Posted on 2023-09-16 Edited on 2023-02-27 In reference , protocol , git

参考： Git 原理入门 - 阮一峰的网络日志 (ruanyifeng.com)

示例八：同步远程仓库

现在回到bob视角，由于之前alice对项目做过许多更改，现在需要更新本地仓库内容

# 同步远程仓库的内容至本地
PS ~\bobWorkspace\gitLearning> git fetch origin
remote: Enumerating objects: 27, done.
remote: Counting objects: 100% (27/27), done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 22 (delta 11), reused 22 (delta 11), pack-reused 0
Unpacking objects: 100% (22/22), 1.93 KiB | 2.00 KiB/s, done.
From github.com:WilsonGoGo/gitLearning
   f712190..f8a5a91  dev        -> origin/dev
   a8dd21a..6259c91  alice      -> origin/alice
# 注：
# 这一步只是获取远程仓库里远程分支的信息，不会对本地内容进行修改
# 即，至更新git branch -r的远程分支内容

# 将远程仓库的dev分支同步给本地的dev分支
PS ~\bobWorkspace\gitLearning> git pull origin dev
From github.com:WilsonGoGo/gitLearning
 * branch            dev        -> FETCH_HEAD
Updating f712190..f8a5a91
Fast-forward
 aliceInfo/workList.txt | Bin 0 -> 144 bytes
 nameList.txt           | Bin 0 -> 26 bytes
 task.doc               | Bin 50 -> 98 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 aliceInfo/workList.txt
 create mode 100644 nameList.txt
 # 注：
 # git pull <repoName> <repo branch>:<local branch>  命令
 # 实际上就是先fetch远程仓库中<repoName>/<repo branch>分支信息
 # 再执行git merge <repoName>/<repo branch> <local branch> 将远程分支与本地分支合并
 # 如果merge过程中有冲突，则同样需要解决冲突

现在已经保证了本地dev分支与远程仓库的dev分支相同，bob开始第一次开发，并提交commit

# 创建相应文件与目录
PS ~\bobWorkspace\gitLearning> mkdir bobInfo
PS ~\bobWorkspace\gitLearning> new-item bobInfo/workList.txt
# 提交commit
PS ~\bobWorkspace\gitLearning> git add .
PS ~\bobWorkspace\gitLearning> git commit -m "init bobInfo"
[dev 93ae1a5] init bobInfo
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 bobInfo/workList.txt

但是bob此时错误的将这次commit提交至了dev分支。现在bob希望撤销本次在dev分支上的commit，转而基于dev分支创建bob分支从而提交本次开发的commit

# bob选择用revert命令撤销上一次commit的改动
PS ~\bobWorkspace\gitLearning> git revert 93ae1a
[dev 6a4218a] Revert "init bobInfo"
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 bobInfo/workList.txt
# 注：
# convert指令是通过一次新的commit提交，用相反的操作抵消目标commit的所有操作

可视化结果如下，可以看出与reset不同，dev分支上多了一个revert操作对应的commit

1663332986501

示例九：冲突推送

1.push撤销

alice在nameList.txt内添加了carol的名字，并提交了commit，push至了远程仓库，alice需要撤销上一次push操作

PS ~\aliceWorkspace> "carol" >> .\nameList.txt
Everything up-to-date
PS ~\aliceWorkspace> git add .
PS ~\aliceWorkspace> git switch dev
Switched to branch 'dev'
M       nameList.txt
Your branch is up to date with 'origin/dev'.
PS ~\aliceWorkspace> git commit -m "nameList : add carol"
[dev 782de60] nameList : add carol
 1 file changed, 0 insertions(+), 0 deletions(-)
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 307 bytes | 307.00 KiB/s, done.
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (1/1), completed with 1 local object.
To github.com:WilsonGoGo/gitLearning.git
   f8a5a91..782de60  dev -> dev

方法一：用revert的方法，push一个撤销操作的commit至远程仓库

# 如果本地已经使用了reset撤销了这次commit
PS ~\aliceWorkspace> git reset HEAD^
# 则先将本地仓库同步至远程仓库状态
PS ~\aliceWorkspace> git merge origin/dev
Updating f8a5a91..782de60
Fast-forward
 nameList.txt | Bin 26 -> 40 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
# 提交revert操作
PS ~\aliceWorkspace> git revert 782de6
[dev bf6cf22] Revert "nameList : add carol"
 1 file changed, 0 insertions(+), 0 deletions(-)
# 推送至远程仓库
PS ~\aliceWorkspace> git push origin --all
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 8 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 323 bytes | 323.00 KiB/s, done.
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (1/1), completed with 1 local object.
To github.com:WilsonGoGo/gitLearning.git
   782de60..bf6cf22  dev -> dev

方法二：如果本地已经使用了reset撤销了这次commit，考虑使用–force来push，实现覆盖远程仓库

1	PS ~\aliceWorkspace> git push --force origin --all

2.push冲突

现在模拟以下alice和bob同步开发导致的冲突，首先双方都需要先fetch仓库保证自己dev分支已经和远程仓库同步，然后双方各自在本地基于dev分支创建自己名称的分支，用于独立开发各自的内容

### alice ###
PS ~\aliceWorkspace> git fetch    
remote: Enumerating objects: 7, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 6 (delta 1), reused 6 (delta 1), pack-reused 0
From github.com:WilsonGoGo/gitLearning
PS ~\aliceWorkspace> git merge origin/dev
Updating bf6cf22..f7c3213
Fast-forward
PS ~\aliceWorkspace> git switch alice
Switched to branch 'alice'
PS ~\aliceWorkspace> git merge dev # alice分支之前已经存在，这里将其与dev分支合并，保证其此时与dev同步
Merge made by the 'ort' strategy.
### bob ###
PS ~\bobWorkspace\gitLearning> git fetch
PS ~\bobWorkspace\gitLearning> git merge origin/dev
Already up to date.
PS ~\bobWorkspace\gitLearning> git branch bob	# bob分支是新建的
PS ~\bobWorkspace\gitLearning> git switch bob
Switched to branch 'bob'

现在假设bob先一步开发完成，并将自己的内容合并至了dev分支

# 修改工作区文件
PS ~\bobWorkspace\gitLearning> mkdir bobInfo
PS ~\bobWorkspace\gitLearning> new-item .\bobInfo\workList.txt
PS ~\bobWorkspace\gitLearning> "demo 9" >> .\bobInfo\workList.txt
PS ~\bobWorkspace\gitLearning> " complete" >> .\bobInfo\workList.txt
PS ~\bobWorkspace\gitLearning> "bob finished" >> .\task.doc
# 提交至暂存区
PS ~\bobWorkspace\gitLearning> git add .
# 本地提交commit
PS ~\bobWorkspace\gitLearning> git commit -m "update : bob workList and task.doc"
[bob 1220d06] update : bob workList and task.doc
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 bobInfo/workList.txt
# 将bob分支的开发内容合并给dev分支
PS ~\bobWorkspace\gitLearning> git switch dev
Switched to branch 'dev'
Your branch is up to date with 'origin/dev'.
PS ~\bobWorkspace\gitLearning> git merge bob
Updating f7c3213..1220d06
Fast-forward
 bobInfo/workList.txt | Bin 0 -> 40 bytes
 task.doc             | Bin 98 -> 126 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 bobInfo/workList.txt
# 推送至远程仓库
PS ~\bobWorkspace\gitLearning> git push origin --all
Enumerating objects: 7, done.
Counting objects: 100% (7/7), done.
Delta compression using up to 8 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (5/5), 458 bytes | 458.00 KiB/s, done.
Total 5 (delta 2), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
To github.com:WilsonGoGo/gitLearning.git
   f7c3213..1220d06  dev -> dev
 * [new branch]      bob -> bob

这时候alice也同步进行开发

# 修改工作区文件
PS ~\aliceWorkspace> " complete" >> .\aliceInfo\workList.txt
PS ~\aliceWorkspace> "alice complete" >> .\task.doc
# 添加至暂存区
PS ~\aliceWorkspace> git add .
# 本地提交commit
PS ~\aliceWorkspace> git commit -m "update : alice workList and task.doc"
[alice 18524b6] update : alice workList and task.doc
 2 files changed, 0 insertions(+), 0 deletions(-)
# 合并开发内容至dev分支
PS ~\aliceWorkspace> git switch dev 
Switched to branch 'dev'
Your branch is up to date with 'origin/dev'.
PS ~\aliceWorkspace> git merge alice
Updating f7c3213..18524b6
Fast-forward
 aliceInfo/workList.txt | Bin 144 -> 230 bytes
 task.doc               | Bin 98 -> 146 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

但是由于alice和bob在开发时都修改了task.doc文件，因此在推送时会产生冲突，报错如下所示

PS ~\aliceWorkspace> git push origin --all
Enumerating objects: 26, done.
Counting objects: 100% (25/25), done.
Delta compression using up to 8 threads
Compressing objects: 100% (12/12), done.
Writing objects: 100% (16/16), 1.78 KiB | 909.00 KiB/s, done.
Total 16 (delta 5), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (5/5), completed with 3 local objects.
To github.com:WilsonGoGo/gitLearning.git
   ad21717..18524b6  alice -> alice
 ! [rejected]        dev -> dev (fetch first)
error: failed to push some refs to 'github.com:WilsonGoGo/gitLearning.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

为了解决冲突，先将远程仓库同步至本地，检查可视化视图（蓝色是远程仓库分支）

1663335659115

# 同步远程分支
PS ~\aliceWorkspace> git fetch
remote: Enumerating objects: 7, done.
remote: Counting objects: 100% (7/7), done.
remote: Compressing objects: 100% (1/1), done.
remote: Total 5 (delta 2), reused 5 (delta 2), pack-reused 0
Unpacking objects: 100% (5/5), 438 bytes | 4.00 KiB/s, done.
From github.com:WilsonGoGo/gitLearning
   f7c3213..1220d06  dev        -> origin/dev
 * [new branch]      bob        -> origin/bob

# 将远程的dev分支合并到本地dev分支
PS ~\aliceWorkspace> git merge origin/dev
warning: Cannot merge binary files: task.doc (HEAD vs. origin/dev)
Auto-merging task.doc
CONFLICT (content): Merge conflict in task.doc
Automatic merge failed; fix conflicts and then commit the result.

借助VsCode的冲突编辑文本，修改冲突文件

1663335808744

# 修改完冲突后，新建commit作为合并结果
PS ~\aliceWorkspace> git commit -m "merge : fix conflict about task.doc between alice and bob"
[dev b650c32] merge : fix conflict about task.doc between alice and bob
# 推送至远程仓库
PS ~\aliceWorkspace> git push origin --all
Enumerating objects: 7, done.
Counting objects: 100% (7/7), done.
Delta compression using up to 8 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 399 bytes | 399.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
To github.com:WilsonGoGo/gitLearning.git
   1220d06..b650c32  dev -> dev

alice推送完成后，bob也需要再次同步

PS ~\bobWorkspace\gitLearning> git pull origin dev
remote: Enumerating objects: 21, done.
remote: Counting objects: 100% (19/19), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 9 (delta 5), reused 9 (delta 5), pack-reused 0
Unpacking objects: 100% (9/9), 994 bytes | 4.00 KiB/s, done.
From github.com:WilsonGoGo/gitLearning
 * branch            dev        -> FETCH_HEAD
   1220d06..b650c32  dev        -> origin/dev
Updating 1220d06..b650c32
Fast-forward
 aliceInfo/workList.txt | Bin 144 -> 230 bytes
 task.doc               | Bin 126 -> 174 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

检查最终可视化结果

1663335948131

示例十：rebase的使用

如果Alice在开发中途发现自己基于的dev版本过时，可以更新自己本地的dev分支后，用rebase命令将自己的alice分支上的修改应用于新的dev分支

# 在示例十的结尾，alice和bob此时都已经将自己的仓库与远程仓库完成了同步
# 现在bob对dev进行了更改，并推送至远程仓库
PS ~\bobWorkspace\gitLearning> "need demo for rebase" >> .\task.doc	# 工作区改动
PS ~\bobWorkspace\gitLearning> git add .	
PS ~\bobWorkspace\gitLearning> git commit -m "add new need to task.doc"	# 提交commit
[dev dd187f9] add new need to task.doc
 1 file changed, 0 insertions(+), 0 deletions(-)
PS ~\bobWorkspace\gitLearning> git push origin --all	# 推送至远程仓库
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 8 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 326 bytes | 326.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
To github.com:WilsonGoGo/gitLearning.git
   b650c32..dd187f9  dev -> dev

而alice不知道远程仓库的dev分支已更新，alice仍基于之前的dev分支开发当前的alice分支，并完成了两次commit提交

# 第一次commit
PS ~\aliceWorkspace> " complete" >> .\aliceInfo\workList.txt
PS ~\aliceWorkspace> git add .
PS ~\aliceWorkspace> git commit -m "update : alice workList demo 10"
[alice b32b1eb] update : alice workList demo 10
 1 file changed, 0 insertions(+), 0 deletions(-)
 # 第二次commit
PS ~\aliceWorkspace> "working on rebase demo" >> task.doc
PS ~\aliceWorkspace> git add .
PS ~\aliceWorkspace> git commit -m "update rebase need to task.doc"
[alice f85fda0] update rebase need to task.doc
 1 file changed, 0 insertions(+), 0 deletions(-)

alice尝试更新自己的dev分支

PS ~\aliceWorkspace> git fetch
remote: Enumerating objects: 5, done.
remote: Compressing objects: 100% (1/1), done.
remote: Total 3 (delta 2), reused 3 (delta 2), pack-reused 0
Unpacking objects: 100% (3/3), 306 bytes | 4.00 KiB/s, done.
From github.com:WilsonGoGo/gitLearning
   b650c32..dd187f9  dev        -> origin/dev
PS ~\aliceWorkspace> git switch dev
Switched to branch 'dev'
Your branch is behind 'origin/dev' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)
PS ~\aliceWorkspace> git pull origin dev
From github.com:WilsonGoGo/gitLearning
 * branch            dev        -> FETCH_HEAD
Updating b650c32..dd187f9
Fast-forward
 task.doc | Bin 174 -> 218 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

可视化结果如下

1663336936128

alice需要将自己之前在alice分支上的改动应用于新的dev分支上(即上图中蓝色分支的新节点)

# 执行rebase指令
PS ~\aliceWorkspace> git rebase dev alice
warning: Cannot merge binary files: task.doc (HEAD vs. f85fda0 (update rebase need to task.doc))
Auto-merging task.doc
CONFLICT (content): Merge conflict in task.doc
error: could not apply f85fda0... update rebase need to task.doc
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply f85fda0... update rebase need to task.doc
#

因为task.doc的修改有冲突，需要手动解决。仍然借助VsCode的冲突编辑器查看冲突，并重新修改内容

# 修改完毕后，重新提交commit即可
PS ~\aliceWorkspace> git add .
PS ~\aliceWorkspace> git commit -m "fix conflict in task.doc during rebase"
 1 file changed, 0 insertions(+), 0 deletions(-)
# 提交commit后，可以继续执行rebase直至提示完成
PS ~\aliceWorkspace> git rebase --continue
Successfully rebased and updated refs/heads/alice.

最终可视化结果如图所示，可以看到alice分支被续接在新的dev分支节点之后

1663337821662