Question

Saye 我在尝试合并后,并在加入<条码>git status时,有:

# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#   added by them: myfile1.xhtml
#   added by them: myfile2.xhtml
#   added by them: myfile3.xhtml

......我知道,我想要为这些档案中的每一份提供:

git checkout --theirs myfile1.xhtml
git add myfile1.xhtml

......但其中有许多。我怎么会把他们当作一种施舍?

Answer 1

我的案件解决办法最终是简单地在名录路上使用野心,因为档案被归类为:

git checkout --theirs directory_name/*
git add directory_name/*

根据,:

git checkout --theirs directory_name/.

Answer 2

你们可以使用以下指挥系统,检查关于未合并道路的多个档案。

git checkout --theirs `git status | grep "added by them:" | awk  {print $NF} `

执行以下指挥系统以实施上述档案

git commit `git status | grep "added by them:" | awk  {print $NF} `

Answer 3

If your files are deeper than one directory (ie. there are subdirectories) and you want to selectively recursively choose all their files for a directory, then use the following:

grep -lr  <<<<<<<  directory_name/ | xargs git checkout --theirs
git add directory_name/*

(从>, 网页)

Answer 4

检查所有未合并的档案,但没有具体说明目录:

git ls-files --unmerged | perl -n -e /	(.*)/ && print "$1
"  | uniq | xargs -r git checkout --theirs --

https://snipt.net/binjured/git-checkout-theirs-for-all-unjointd/"rel=“nofollow”>

Answer 5

这一简单的解决办法对我来说是有效的,因此,如果把项目称作src,你可以补充所有内容。”

git checkout --theirs src/*

友情链接