讨论git合并时对工作区文件的影响

git合并：对工作区文件的影响分析

最新推荐文章于 2025-09-20 15:41:24 发布

原创最新推荐文章于 2025-09-20 15:41:24 发布 · 1.2k 阅读

4 ·

CC 4.0 BY-SA版权

文章标签：

#git

git 专栏收录该内容

2 篇文章

订阅专栏

本文探讨了git merge操作对工作区文件的影响。当本地与远程分支存在相同文件的不同修改时，会发生冲突。未提交的修改会导致合并中止，已提交的修改则需手动解决冲突。

本文是学习git过程中，对git合并的一些思考和验证。

众所周知，git fetch命令只是对远程分支进行更新，不会对工作区产生影响；而git pull不仅会更新远程分支，还会将远程分支与本地当前分支进行合并，因此对本地工作区有影响，因而就产生了一个疑问，git合并时对工作区文件会产生什么影响呢？

这里先记录以下验证的结论：

在进行git合并操作时，如果当前分支与被合并的分支，同一个文件在2个分支都有修改，则会发生冲突。而当前分支没有冲突的修改文件，则不受合并操作的影响。

冲突的场景又可以分成2种：

1. 当前分支文件有修改，还未commit，git merge时会发生冲突。这种情况git会提示error，中止合并。

2. 当前分支文件有修改，且已经commit，git merge时发生冲突。这种情况会发生合并冲突，需要人工解决冲突才能完成合并。

1. 当前分支文件有修改，还未commit，git merge时发生冲突。

kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (master)
$ git status
On branch master
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   1test.txt

no changes added to commit (use "git add" and/or "git commit -a")

kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (master)
$ git merge feature1
error: Your local changes to the following files would be overwritten by merge:
        1test.txt
Please commit your changes or stash them before you merge.
Aborting
Updating 8fff495..4aee2f0

kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (master)
$ git add .

kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (master)
$ git status
On branch master
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   1test.txt


kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (master)
$ git merge feature1
error: Your local changes to the following files would be overwritten by merge:
        1test.txt
Please commit your changes or stash them before you merge.
Aborting
Updating 8fff495..4aee2f0

kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (master)
$ git checkout feature1
error: Your local changes to the following files would be overwritten by checkout:
        1test.txt
Please commit your changes or stash them before you switch branches.
Aborting

2. 当前分支文件有修改，且已经commit，git merge时发生冲突。

kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (master)
$ git checkout feature1
Switched to branch 'feature1'

kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (feature1)
$ cat test.txt
version 1
version 2
version 33
version4

kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (feature1)
$ vim test.txt

kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (feature1)
$ vim test.txt

kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (feature1)
$ git commit -am "add version56"
[feature1 a06e7d1] add version56
 1 file changed, 2 insertions(+)

kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (feature1)
$ cat test.txt
version 1
version 2
version 33
version4
version5
version6

kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (feature1)
$ git checkout master
Switched to branch 'master'

kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (master)
$ vim test.txt

kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (master)
$ cat test.txt
version 1
version 2
version 33
version4
version5

kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (master)
$ git commit -am "add version5"
[master 3947653] add version5
 1 file changed, 1 insertion(+)

kuang@LAPTOP-A42TLRAL MINGW64 ~/Desktop/temp/git_demo1 (master)
$ git merge feature1
Auto-merging test.txt
CONFLICT (content): Merge conflict in test.txt
Automatic merge failed; fix conflicts and then commit the result.