在项目开发过程我们合并分支时经常会碰到冲突的问题下面通过一个简单的例子演示下冲突是如何产生的以及如何去解决冲突。1、冲突的产生1.1、主干分支代码在主干分支有两个文件main.cpp#include stdio.h #include string.h int main() { char data[100] my branch name is master; int length strlen(data); for(int i 0; i length; i) { printf(%c, data[i]); } printf(branch master\n); return 0; }README.mdthis is master branch这个时候tom和jack分别拉取了主干分支的代码并进行了修改。1.2、tom修改代码提交合并tom创建A分支并对文件做了以下修改main.cpp#include stdio.h #include string.h int main() { char data[100] my branch name is A; int length strlen(data); for(int i 0; i length; i) { printf(%c, data[i]); } printf(branch AAA\n); return 0; }README.mdthis is AAA branch提交代码并合并到主干lngDESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (A) $ git add . lngDESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (A) $ git commit -m A分支代码提交 [A ccb2626] A分支代码提交 2 files changed, 3 insertions(), 3 deletions(-) lngDESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (A) $ git push origin A Enumerating objects: 7, done. Counting objects: 100% (7/7), done. Delta compression using up to 12 threads Compressing objects: 100% (2/2), done. Writing objects: 100% (4/4), 376 bytes | 376.00 KiB/s, done. Total 4 (delta 1), reused 3 (delta 1), pack-reused 0 remote: Powered by GITEE.COM [GNK-6.2] remote: Create a pull request for A on Gitee by visiting: remote: https://gitee.com/lingpe/kaol/pull/new/lingpe:A...lingpe:master To https://gitee.com/lingpe/kaol.git * [new branch] A - A lngDESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (A) $ git checkout master Switched to branch master Your branch is up to date with origin/master. lngDESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (master) $ git merge A Updating 40c0115..ccb2626 Fast-forward README.md | 2 - main.cpp | 4 -- 2 files changed, 3 insertions(), 3 deletions(-) lngDESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (master) $ git push origin master Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 remote: Powered by GITEE.COM [GNK-6.2] To https://gitee.com/lingpe/kaol.git 40c0115..ccb2626 master - master lngDESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (master) $1.3、jack修改代码提交合并jack对代码做了如下修改main.cpp#include stdio.h #include string.h int main() { char data[100] my branch name is B; int length strlen(data); for(int i 0; i length; i) { printf(%c, data[i]); } printf(branch BBB\n); return 0; }README.mdthis is BBB branch提交代码并合并到主干lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git add . lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git commit -m B分支代码提交 [B bdcbe03] B分支代码提交 2 files changed, 3 insertions(), 3 deletions(-) lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git push origin B Enumerating objects: 53, done. Counting objects: 100% (53/53), done. Delta compression using up to 12 threads Compressing objects: 100% (34/34), done. Writing objects: 100% (50/50), 4.66 KiB | 2.33 MiB/s, done. Total 50 (delta 16), reused 43 (delta 12), pack-reused 0 remote: Powered by GITEE.COM [GNK-6.2] remote: Create a pull request for B on Gitee by visiting: remote: https://gitee.com/lingpe/kaol/pull/new/lingpe:B...lingpe:master To https://gitee.com/lingpe/kaol.git * [new branch] B - B lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git checkout master Switched to branch master Your branch is up to date with origin/master. lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (master) $ git merge B Updating 40c0115..bdcbe03 Fast-forward README.md | 2 - main.cpp | 4 -- 2 files changed, 3 insertions(), 3 deletions(-) lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (master) $push时产生冲突lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (master) $ git push origin master To https://gitee.com/lingpe/kaol.git ! [rejected] master - master (fetch first) error: failed to push some refs to https://gitee.com/lingpe/kaol.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. lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (master) $2、解决冲突接下来就是如何解决冲突切换回B分支然后拉取主干分支代码lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git pull origin master remote: Enumerating objects: 7, done. remote: Counting objects: 100% (7/7), done. remote: Compressing objects: 100% (3/3), done. remote: Total 4 (delta 1), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (4/4), 356 bytes | 178.00 KiB/s, done. From https://gitee.com/lingpe/kaol * branch master - FETCH_HEAD 40c0115..ccb2626 master - origin/master Auto-merging main.cpp CONFLICT (content): Merge conflict in main.cpp Auto-merging README.md CONFLICT (content): Merge conflict in README.md Automatic merge failed; fix conflicts and then commit the result.拉取失败可以看到提示信息告诉我们哪个文件产生了冲突。直接打开main.cpp文件可以看到有以下特殊字符提示我们哪一行代码产生了冲突。#include stdio.h #include string.h int main() { HEAD char data[100] my branch name is B; char data[100] my branch name is A; ccb26269f42245dfcbedfbf2218419c5ab7f2787 int length strlen(data); for(int i 0; i length; i) { printf(%c, data[i]); } HEAD printf(branch BBB\n); printf(branch AAA\n); ccb26269f42245dfcbedfbf2218419c5ab7f2787 return 0; }直接在文件中手动解决冲突。删除文件中的特殊字符然后根据需求修改代码。#include stdio.h #include string.h int main() { char data[100] my branch name is B and A; int length strlen(data); for(int i 0; i length; i) { printf(%c, data[i]); } printf(branch BBB\n); printf(branch AAA\n); return 0; } ~同理对README.md手动解决冲突。this is BBB and AAA branch解决完冲突后提交到B分支lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B|MERGING) $ git add . lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B|MERGING) $ git commit -m 解决冲突 [B f30e1ea] 解决冲突 lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git push origin B Enumerating objects: 10, done. Counting objects: 100% (10/10), done. Delta compression using up to 12 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (4/4), 405 bytes | 405.00 KiB/s, done. Total 4 (delta 1), reused 0 (delta 0), pack-reused 0 remote: Powered by GITEE.COM [GNK-6.2] To https://gitee.com/lingpe/kaol.git bdcbe03..f30e1ea B - B lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $最后将B分支合并到主干就不会产生冲突了lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git checkout master Switched to branch master Your branch and origin/master have diverged, and have 1 and 1 different commits each, respectively. (use git pull to merge the remote branch into yours) lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (master) $ git merge B Updating bdcbe03..f30e1ea Fast-forward README.md | 2 - main.cpp | 4 -- 2 files changed, 3 insertions(), 3 deletions(-) lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (master) $ git push origin master Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 remote: Powered by GITEE.COM [GNK-6.2] To https://gitee.com/lingpe/kaol.git ccb2626..f30e1ea master - master lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (master) $至此冲突成功解决可以看下主干分支的代码main.cpp#include stdio.h #include string.h int main() { char data[100] my branch name is B and A; int length strlen(data); for(int i 0; i length; i) { printf(%c, data[i]); } printf(branch BBB\n); printf(branch AAA\n); return 0; }README.mdthis is BBB and AAA branchOK3、总结# 1、切换到master分支主分支 git checkout master # 2、拉取主分支最新代码 git pull origin master # 3、合并BBB分支到master分支 git merge BBB # 4、出现冲突提示 # 会有Auto-merging、CONFLICT(content)等字符打印 # CONFLICT(content)后面的文件就是出现冲突的文件 # 或者执行git status命令会有both modified字符标记冲突文件 # 5、解决冲突根据具体需求判断哪些代码要保留或删除 HEAD // 这里是master分支上的原有代码 ... // 这里是BBB分支上的新代码 ... BBB # 6、提交代码 git add . # 7、添加提交信息 git commit -m 解决冲突 # 8、推动到主分支 git push origin master # 备注如果没有冲突第3步执行完就可以直接执行第8步
git合并分支时如何解决冲突
在项目开发过程我们合并分支时经常会碰到冲突的问题下面通过一个简单的例子演示下冲突是如何产生的以及如何去解决冲突。1、冲突的产生1.1、主干分支代码在主干分支有两个文件main.cpp#include stdio.h #include string.h int main() { char data[100] my branch name is master; int length strlen(data); for(int i 0; i length; i) { printf(%c, data[i]); } printf(branch master\n); return 0; }README.mdthis is master branch这个时候tom和jack分别拉取了主干分支的代码并进行了修改。1.2、tom修改代码提交合并tom创建A分支并对文件做了以下修改main.cpp#include stdio.h #include string.h int main() { char data[100] my branch name is A; int length strlen(data); for(int i 0; i length; i) { printf(%c, data[i]); } printf(branch AAA\n); return 0; }README.mdthis is AAA branch提交代码并合并到主干lngDESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (A) $ git add . lngDESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (A) $ git commit -m A分支代码提交 [A ccb2626] A分支代码提交 2 files changed, 3 insertions(), 3 deletions(-) lngDESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (A) $ git push origin A Enumerating objects: 7, done. Counting objects: 100% (7/7), done. Delta compression using up to 12 threads Compressing objects: 100% (2/2), done. Writing objects: 100% (4/4), 376 bytes | 376.00 KiB/s, done. Total 4 (delta 1), reused 3 (delta 1), pack-reused 0 remote: Powered by GITEE.COM [GNK-6.2] remote: Create a pull request for A on Gitee by visiting: remote: https://gitee.com/lingpe/kaol/pull/new/lingpe:A...lingpe:master To https://gitee.com/lingpe/kaol.git * [new branch] A - A lngDESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (A) $ git checkout master Switched to branch master Your branch is up to date with origin/master. lngDESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (master) $ git merge A Updating 40c0115..ccb2626 Fast-forward README.md | 2 - main.cpp | 4 -- 2 files changed, 3 insertions(), 3 deletions(-) lngDESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (master) $ git push origin master Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 remote: Powered by GITEE.COM [GNK-6.2] To https://gitee.com/lingpe/kaol.git 40c0115..ccb2626 master - master lngDESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (master) $1.3、jack修改代码提交合并jack对代码做了如下修改main.cpp#include stdio.h #include string.h int main() { char data[100] my branch name is B; int length strlen(data); for(int i 0; i length; i) { printf(%c, data[i]); } printf(branch BBB\n); return 0; }README.mdthis is BBB branch提交代码并合并到主干lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git add . lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git commit -m B分支代码提交 [B bdcbe03] B分支代码提交 2 files changed, 3 insertions(), 3 deletions(-) lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git push origin B Enumerating objects: 53, done. Counting objects: 100% (53/53), done. Delta compression using up to 12 threads Compressing objects: 100% (34/34), done. Writing objects: 100% (50/50), 4.66 KiB | 2.33 MiB/s, done. Total 50 (delta 16), reused 43 (delta 12), pack-reused 0 remote: Powered by GITEE.COM [GNK-6.2] remote: Create a pull request for B on Gitee by visiting: remote: https://gitee.com/lingpe/kaol/pull/new/lingpe:B...lingpe:master To https://gitee.com/lingpe/kaol.git * [new branch] B - B lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git checkout master Switched to branch master Your branch is up to date with origin/master. lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (master) $ git merge B Updating 40c0115..bdcbe03 Fast-forward README.md | 2 - main.cpp | 4 -- 2 files changed, 3 insertions(), 3 deletions(-) lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (master) $push时产生冲突lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (master) $ git push origin master To https://gitee.com/lingpe/kaol.git ! [rejected] master - master (fetch first) error: failed to push some refs to https://gitee.com/lingpe/kaol.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. lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (master) $2、解决冲突接下来就是如何解决冲突切换回B分支然后拉取主干分支代码lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git pull origin master remote: Enumerating objects: 7, done. remote: Counting objects: 100% (7/7), done. remote: Compressing objects: 100% (3/3), done. remote: Total 4 (delta 1), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (4/4), 356 bytes | 178.00 KiB/s, done. From https://gitee.com/lingpe/kaol * branch master - FETCH_HEAD 40c0115..ccb2626 master - origin/master Auto-merging main.cpp CONFLICT (content): Merge conflict in main.cpp Auto-merging README.md CONFLICT (content): Merge conflict in README.md Automatic merge failed; fix conflicts and then commit the result.拉取失败可以看到提示信息告诉我们哪个文件产生了冲突。直接打开main.cpp文件可以看到有以下特殊字符提示我们哪一行代码产生了冲突。#include stdio.h #include string.h int main() { HEAD char data[100] my branch name is B; char data[100] my branch name is A; ccb26269f42245dfcbedfbf2218419c5ab7f2787 int length strlen(data); for(int i 0; i length; i) { printf(%c, data[i]); } HEAD printf(branch BBB\n); printf(branch AAA\n); ccb26269f42245dfcbedfbf2218419c5ab7f2787 return 0; }直接在文件中手动解决冲突。删除文件中的特殊字符然后根据需求修改代码。#include stdio.h #include string.h int main() { char data[100] my branch name is B and A; int length strlen(data); for(int i 0; i length; i) { printf(%c, data[i]); } printf(branch BBB\n); printf(branch AAA\n); return 0; } ~同理对README.md手动解决冲突。this is BBB and AAA branch解决完冲突后提交到B分支lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B|MERGING) $ git add . lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B|MERGING) $ git commit -m 解决冲突 [B f30e1ea] 解决冲突 lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git push origin B Enumerating objects: 10, done. Counting objects: 100% (10/10), done. Delta compression using up to 12 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (4/4), 405 bytes | 405.00 KiB/s, done. Total 4 (delta 1), reused 0 (delta 0), pack-reused 0 remote: Powered by GITEE.COM [GNK-6.2] To https://gitee.com/lingpe/kaol.git bdcbe03..f30e1ea B - B lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $最后将B分支合并到主干就不会产生冲突了lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git checkout master Switched to branch master Your branch and origin/master have diverged, and have 1 and 1 different commits each, respectively. (use git pull to merge the remote branch into yours) lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (master) $ git merge B Updating bdcbe03..f30e1ea Fast-forward README.md | 2 - main.cpp | 4 -- 2 files changed, 3 insertions(), 3 deletions(-) lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (master) $ git push origin master Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 remote: Powered by GITEE.COM [GNK-6.2] To https://gitee.com/lingpe/kaol.git ccb2626..f30e1ea master - master lngDESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (master) $至此冲突成功解决可以看下主干分支的代码main.cpp#include stdio.h #include string.h int main() { char data[100] my branch name is B and A; int length strlen(data); for(int i 0; i length; i) { printf(%c, data[i]); } printf(branch BBB\n); printf(branch AAA\n); return 0; }README.mdthis is BBB and AAA branchOK3、总结# 1、切换到master分支主分支 git checkout master # 2、拉取主分支最新代码 git pull origin master # 3、合并BBB分支到master分支 git merge BBB # 4、出现冲突提示 # 会有Auto-merging、CONFLICT(content)等字符打印 # CONFLICT(content)后面的文件就是出现冲突的文件 # 或者执行git status命令会有both modified字符标记冲突文件 # 5、解决冲突根据具体需求判断哪些代码要保留或删除 HEAD // 这里是master分支上的原有代码 ... // 这里是BBB分支上的新代码 ... BBB # 6、提交代码 git add . # 7、添加提交信息 git commit -m 解决冲突 # 8、推动到主分支 git push origin master # 备注如果没有冲突第3步执行完就可以直接执行第8步
