这是我的git仓库的初始快照。
在分支
在分支
如果我尝试从主分支合并
尽管我在
为了验证文件的实际内容并确保这是否是由于空格造成的:
在分支
master
上,文件m1
包含。L1
在分支
dev
上,文件m1
包含。L1
L2
如果我尝试从主分支合并
dev
分支,会导致冲突。$ git checkout master
Switched to branch 'master'
$ git merge dev
Auto-merging m1
CONFLICT (content): Merge conflict in m1
Automatic merge failed; fix conflicts and then commit the result.
$ git diff
diff --cc m1
index 078f94b,9f46047..0000000
--- a/m1
+++ b/m1
@@@ -1,1 -1,2 +1,5 @@@
L1
++<<<<<<< HEAD
++=======
+ L2
++>>>>>>> dev
尽管我在
master
中没有修改m1
的第2行,但为什么会导致冲突?为了验证文件的实际内容并确保这是否是由于空格造成的:
在分支
master
上:git branch
dev
* master
$ xxd m1
0000000: 4c31 0a L1.
在分支 dev
上
$ git checkout dev
Switched to branch 'dev'
$ xxd m1
0000000: 4c31 0a4c 320a L1.L2.
这是我用来创建此仓库的脚本。
#!/bin/bash
mkdir git_demo
cd git_demo
git init
touch m1
git add .
git commit -m "Added file: m1"
# sleep is needed, otherwise a different repo is being created, probably because of *some* filesystem issue!
sleep 1
git branch dev
echo L1 >> m1
git add .
git commit -m "Added line L1 to m1"
# sleep is needed, otherwise a different repo is being created, probably because of *some* filesystem issue!
sleep 1
git checkout dev
echo L1 >> m1
git add .
git commit -m "Added line L1 to m1"
# sleep is needed, otherwise a different repo is being created, probably because of *some* filesystem issue!
sleep 1
echo L2 >> m1
git add .
git commit -m "Added line L2 to m1"
# sleep is needed, otherwise a different repo is being created, probably because of *some* filesystem issue!
gitg --all
git checkout master
git merge dev
merge
跳过重复提交(我故意引入的)并应用其他提交。 - sherlock