git解決合并沖突的方法：1、編輯有沖突的文件，并刪除文件中的特殊符號，根據(jù)需求修改代碼；2、將指定文件添加到暫存區(qū)，并將指定的分支提交到主干，執(zhí)行提交即可，其中使用“git commit”命令時不能帶文件名, 加文件名會報錯。

本文操作環(huán)境：Windows10系統(tǒng)、Git2.30.0版、Dell G3電腦。

git怎么解決合并沖突

git沖突

多個分支代碼合并到一個分支時，兩個分支中修改了同一個文件，不管是什么地方修改，都會產(chǎn)生；

還有一種 兩個分支中修改了同一個文件的名稱時會產(chǎn)生。

原因

合并分支時，兩個分支在同一個文件有兩套完全不同的修改。Git 無法替

我們決定使用哪一個。必須人為決定新代碼內(nèi)容。

解決方法

編輯有沖突的文件，刪除特殊符號，決定要使用的內(nèi)容

添加到暫存區(qū)

執(zhí)行提交（注意：此時使用 git commit 命令時不能帶文件名, 加文件名會報錯，成功提交后，merging消失）

示例如下：

1、沖突的產(chǎn)生

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 mastern"); 	 	return 0; }

README.md

this is master branch

這個時候tom和jack分別拉取了主干分支的代碼，并進行了修改。

1.2、tom修改代碼提交合并

tom創(chuàng)建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 AAAn"); 	 	return 0; }

README.md

this is AAA branch

提交代碼并合并到主干

lng@DESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (A) $ git add .  lng@DESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (A) $ git commit -m "A分支代碼提交" [A ccb2626] A分支代碼提交  2 files changed, 3 insertions(+), 3 deletions(-)  lng@DESKTOP-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  lng@DESKTOP-9TD21KL MINGW64 ~/Desktop/tom/kaol (A) $ git checkout master Switched to branch 'master' Your branch is up to date with 'origin/master'.  lng@DESKTOP-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(-)  lng@DESKTOP-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  lng@DESKTOP-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 BBBn"); 	 	return 0; }

README.md

this is BBB branch

提交代碼并合并到主干

lng@DESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git add .  lng@DESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git commit -m "B分支代碼提交" [B bdcbe03] B分支代碼提交  2 files changed, 3 insertions(+), 3 deletions(-)  lng@DESKTOP-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  lng@DESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git checkout master Switched to branch 'master' Your branch is up to date with 'origin/master'.  lng@DESKTOP-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(-)  lng@DESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (master) $

push時產(chǎn)生沖突

lng@DESKTOP-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.  lng@DESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (master) $

2、解決沖突

接下來就是如何解決沖突

切換回B分支，然后拉取主干分支代碼

lng@DESKTOP-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.

拉取失敗，可以看到提示信息，告訴我們哪個文件產(chǎn)生了沖突。

直接打開main.cpp文件，可以看到有以下特殊字符，提示我們哪一行代碼產(chǎn)生了沖突。

#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 BBBn"); =======         printf("branch AAAn"); >>>>>>> ccb26269f42245dfcbedfbf2218419c5ab7f2787          return 0; }

直接在文件中手動解決沖突。刪除文件中的特殊字符，然后根據(jù)需求修改代碼。

#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 BBBn");         printf("branch AAAn");         return 0; } ~

同理，對README.md，手動解決沖突。

this is BBB and AAA branch

解決完沖突后提交到B分支

lng@DESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B|MERGING) $ git add .  lng@DESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B|MERGING) $ git commit -m "解決沖突" [B f30e1ea] 解決沖突  lng@DESKTOP-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  lng@DESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $

最后將B分支合并到主干，就不會產(chǎn)生沖突了

lng@DESKTOP-9TD21KL MINGW64 ~/Desktop/jack/kaol (B) $ git checkout master Switched to branch 'master' Your branch and 'origin/master' have perged, and have 1 and 1 different commits each, respectively.   (use "git pull" to merge the remote branch into yours)  lng@DESKTOP-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(-)  lng@DESKTOP-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  lng@DESKTOP-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 BBBn"); 	printf("branch AAAn"); 	return 0; }

README.md

this is BBB and AAA branch

OK

推薦學習：《Git教程》