4、Git多人單分支集成協作時的常見場景
阿新 • • 發佈：2019-03-29
forward ranch ror rac osi font rate .html The
1.1、不同人修改了不同文件如何處理
# user: git本地使用laowang，github使用dy201
# 本地clone一個倉庫 git_learning_02
k@k-PC MINGW64 /user/dy201/101-GitRunner
$ git clone [email protected]:dy201/git_learning.git git_learning_02;
Cloning into ‘git_learning_02‘...
Enter passphrase for key ‘/c/Users/k/.ssh/id_rsa‘:
remote: Enumerating objects:
1.2、不同人修改了同文件的不同區域如何處理
# 修改 02的 index
# 修改 的 index
# 提交 git_learning 到 github
k@k-PC MINGW64 /user/dy201/101-GitRunner/git_learning (feature/add_git_commands)
$ git push github
Enter passphrase for key ‘/c/Users/k/.ssh/id_rsa‘:
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 4 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 300 bytes | 75.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0)
remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
To github.com:dy201/git_learning.git
9ecaa51..decebd1 feature/add_git_commands -> feature/add_git_commands
# 先fetch 後merge （遇到了問題，根據提示直接pull）
$ git merge origin/feature/add_git_commands
Auto-merging index.html
CONFLICT (content): Merge conflict in index.html
Automatic merge failed; fix conflicts and then commit the result.
#讀取 index文件（內容正確）
$ cat index.html
this is a index.html
this is second time
this third time : diff between commit and HEAD
<<<<<<< HEAD
02 -> non fast forward
=======
test different user to update project!
-> non fast forward
>>>>>>> origin/feature/add_git_commands
# push到遠端
$ git push
Enter passphrase for key ‘/c/Users/k/.ssh/id_rsa‘:
Enumerating objects: 10, done.
Counting objects: 100% (10/10), done.
Delta compression using up to 4 threads
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 701 bytes | 116.00 KiB/s, done.
Total 6 (delta 4), reused 0 (delta 0)
remote: Resolving deltas: 100% (4/4), completed with 2 local objects.
To github.com:dy201/git_learning.git
decebd1..783e619 feature/add_git_commands -> feature/add_git_commands
1.3、不同人修改了通文件的同一區域如何處理
# pull 後產生一個狀態
$ git status
On branch feature/add_git_commands
Your branch and ‘github/feature/add_git_commands‘ have diverged,
and have 1 and 3 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: index.html
no changes added to commit (use "git add" and/or "git commit -a")
# 進行提交後，進行push
1.4、同時變更了文件名和文件內容如何處理
1.5、把同一文件改成不同的文件名如何處理
4、Git多人單分支集成協作時的常見場景