Git 合并 - 符号链接冲突

Question

合并后我得到一个象征性的 links 冲突：

$ git status
[SKIP]
both added:      file.txt
[SKIP]

Git diff 不显示目标值：

$ git diff
[SKIP]
diff --cc file.txt
index 5873c9d,e31df9a..0000000
--- a/file.txt
+++ b/file.txt

是否有比较符号 link 目标值的简单方法？

Answer 1

使用 git 显示，您可以显示 link 的目标。
我刚刚在测试回购上测试了它，link 引用了不同分支中的文件一或文件二。
合并有冲突：

vonc@voncavn7:/mnt/d/git/tests/sml/a$ git commit -m "add link from one"
[one 22b4906] add link from one
 1 file changed, 1 insertion(+)
 create mode 120000 link
vonc@voncavn7:/mnt/d/git/tests/sml/a$ git merge -s recursive two
Auto-merging link
CONFLICT (add/add): Merge conflict in link
Automatic merge failed; fix conflicts and then commit the result.
vonc@voncavn7:/mnt/d/git/tests/sml/a$ git diff
diff --cc link
index 43dd47e,1ed3c7a..0000000
--- a/link
+++ b/link

但我可以看到哪个指向哪个：

vonc@voncavn7:/mnt/d/git/tests/sml/a$ git show :2:link
one
vonc@voncavn7:/mnt/d/git/tests/sml/a$ git show :3:link
zero

---

请注意，对于 Git 2.16.x/2.17，如果您选择合并 选项，您将能够自动解决它。 =78=] 这是因为“git merge -Xours/-Xtheirs”在解决符号 link.

的冲突更新时学会了使用 our/their 版本

参见 commit fd48b46 (26 Sep 2017) by Junio C Hamano (gitster)。
^{（由 Junio C Hamano -- gitster -- in commit 14b9d9a 合并，2018 年 1 月 23 日）}

merge: teach -Xours/-Xtheirs to symbolic link merge

The -Xours/-Xtheirs merge options were originally defined as a way to "force" the resolution of 3way textual merge conflicts to take one side without using your editor, hence did not even trigger in situations where you would normally not get the <<< === >>> conflict markers.

This was improved for binary files back in 2012 with a944af1 ("merge: teach -Xours/-Xtheirs to binary ll-merge driver", 2012-09-08, Git v1.7.12.4).

Teach a similar trick to the codepath that deals with merging two conflicting changes to symbolic links.

---

请注意，在 Git 2.24（2019 年第 4 季度）中，合并递​​归代码中的错误会在具有符号 link 的分支与用符号替换它的分支合并时触发 目录已修复。

见commit 83e3ad3 (18 Sep 2019) by Jonathan Tan (jhowtan)。
帮助：Elijah Newren (newren).
^{（由 Junio C Hamano -- gitster -- in commit 1f4485b 合并，2019 年 10 月 7 日）}

merge-recursive: symlink's descendants not in way

When the working tree has:

- bar (directory)
- bar/file (file)
- foo (symlink to .)

(note that lstat() for "foo/bar" would tell us that it is a directory)

and the user merges a commit that deletes the foo symlink and instead contains:

- bar (directory, as above)
- bar/file (file, as above)
- foo (directory)
- foo/bar (file)

the merge should happen without requiring user intervention.
However, this does not happen.

This is because dir_in_way(), when checking the working tree, thinks that "foo/bar" is a directory.
But a symlink should be treated much the same as a file: since dir_in_way() is only checking to see if there is a directory in the way, we don't want symlinks in leading paths to sometimes cause dir_in_way() to return true.

Teach dir_in_way() to also check for symlinks in leading paths before reporting whether a directory is in the way.

---

在 Git 2.33（2021 年第 3 季度）中，“union”冲突解决变体在与二进制合并驱动程序一起使用时行为不当。

见commit 382b601, commit 7f53f78, commit 7d879ad (10 Jun 2021) by Jeff King (peff)。
^{（由 Junio C Hamano -- gitster -- in commit 308528a 合并，2021 年 7 月 13 日）}

ll_binary_merge(): handle XDL_MERGE_FAVOR_UNION

^{Signed-off-by: Jeff King}

Prior to commit a944af1 ("merge: teach -Xours/-Xtheirs to binary ll-merge driver", 2012-09-08, Git v1.8.0-rc0 -- merge listed in batch #7), we always reported a conflict from ll_binary_merge() by returning "1" (in the xdl_merge and ll_merge code, this value is the number of conflict hunks).
After that commit, we report zero conflicts if the "variant" flag is set, under the assumption that it is one of XDL_MERGE_FAVOR_OURS or XDL_MERGE_FAVOR_THEIRS.

But this gets confused by XDL_MERGE_FAVOR_UNION.
We do not know how to do a binary union merge, but erroneously report no conflicts anyway (and just blindly use the "ours" content as the result).

Let's tighten our check to just the cases that a944af1 meant to cover.
This fixes the union case (which existed already back when that commit was made), as well as future-proofing us against any other variants that get added later.

Note that you can't trigger this from "git merge-file --union"^(man), as that bails on binary files before even calling into the ll-merge machinery.