git ls-files包含三次未合并的文件
Posted
tags:
篇首语:本文由小常识网(cha138.com)小编为大家整理,主要介绍了git ls-files包含三次未合并的文件相关的知识,希望对你有一定的参考价值。
例如:
$ git status
On branch master
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: test.txt
$ git ls-files
test.txt
test.txt
test.txt
是否有办法使它仅列出一次此类文件?我只需要文件名。
发生冲突时会发生这种情况。它们每个都是文件的不同版本。检查:
git ls-files -s
看git help read-tree
,关于3向合并]的部分>。对您来说重要的是:...and you will end up with an index with all of the <tree1> entries in "stage1", all of the <tree2> entries in "stage2" and all of the <tree3> entries in "stage3". When performing a merge of another branch into the current branch, we use the common ancestor tree as <tree1>, the current branch head as <tree2>, and the other branch head as <tree3>
是否有办法使它仅列出一次此类文件?
以上是关于git ls-files包含三次未合并的文件的主要内容,如果未能解决你的问题,请参考以下文章
win10 git ls-files显示的是8进制风格文件名leaderf
Git error. Command: `git ls-files --cached --exclude-standard --recurse-submodules`
Git error. Command: `git ls-files --cached --exclude-standard --recurse-submodules`