blocks|key|487122|text|这没有什么意义，因为您并没有提供一个共同的祖先。但是，如果您确实有一个，您可以使用：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|487123|git+merge-file+<current-version>+<common-ancestor>+<other-version>|code-block|syntax|javascript|487124|这会将结果放在当前版本的文件中；如果您希望在其他地方获得结果，请使用：|487125|git+merge-file+-p+<current>+<common>+<other>+>+<dest>|487126|它需要共同的祖先提供一些东西来考虑与之相关的变化。您可以通过提供空文件或存储库历史记录中某个版本的旧版本的副本来破解它，但结果的质量将取决于您选择公共祖先的程度，因为它合并了该版本和每个新版本之间的两个差异。空文件只有在两者非常相似的情况下才能正常工作(多次运行时至少有三行相同的行)。|487127|如果没有这一点，你真正能做的就是看看它们的区别：|487128|git+diff+--no-index+file1+file2|487129|entityMap^0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|T|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|U|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|V|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|W|8|@]|9|@]|A|$]]|$1|M|3|N|5|6|7|X|8|@]|9|@]|A|$]]|$1|O|3|P|5|D|7|Y|8|@]|9|@]|A|$E|F]]|$1|Q|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]]|R|$]]

This doesn't really make sense, because you're not providing a common ancestor. If you do have one, however, you can use:

<pre><code>git merge-file &lt;current-version&gt; &lt;common-ancestor&gt; &lt;other-version&gt;
</code></pre>

This places the results in the current version file; if you want them elsewhere, use:

<pre><code>git merge-file -p &lt;current&gt; &lt;common&gt; &lt;other&gt; &gt; &lt;dest&gt;
</code></pre>

It needs the common ancestor to provide something to consider changes relative to. You could hack it, by providing an empty file or a copy of an older version of one of them from the history of your repository, but the quality of results will depend on how well you select a common ancestor, since it's merging the two diffs, between that and each of the new versions. An empty file will only work well if the two are very similar (many runs of at least three identical lines).

Without that, all you can really do is look at the differences:

<pre><code>git diff --no-index file1 file2
</code></pre>

blocks|key|508984|text|对于您正在尝试做的事情：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|508985|touch+file3++#empty
git+merge-file+file1+file3+file2|code-block|syntax|javascript|508986|这将以file3+(空文件)为基础对file1和file2进行三向合并。|508987|请注意，这将写入file1。当然，如果不需要这样做，您可以执行以下操作：|508988|touch+file3
cp+file1+merge_of_file1_file2
git+merge-file+merge_of_file1_file2+file3+file2|508989|entityMap^0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Q|8|@]|9|@]|A|$]]|$1|I|3|J|5|6|7|R|8|@]|9|@]|A|$]]|$1|K|3|L|5|D|7|S|8|@]|9|@]|A|$E|F]]|$1|M|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|N|$]]

For what you are trying to do:

<pre><code>touch file3 #empty
git merge-file file1 file3 file2
</code></pre>

This will do a three-way merge of file1 and file2 with file3 ( empty file ) as the base.

Note that this writes to file1. You can of course do the below if that is not desired:

<pre><code>touch file3
cp file1 merge_of_file1_file2
git merge-file merge_of_file1_file2 file3 file2
</code></pre>

blocks|key|1503018|text|为了补充manojlds的答案，这里有一个很好的、完整的函数，您可以将它添加到.bashrc中来完成这项工作。它的好处是在“合并冲突”块中正确识别两个文件的名称。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1503019|merge()+{
++local+ext
++[+$#+-ne+2+]+&&+echo+"Error:+Need+exactly+two+args."+&&+return+1
++[[+!+-r+$1+%7C%7C+!+-r+$2+]]+&&+echo+"Error:+One+of+the+files+is+not+readable."+&&+return+1
++if+[[+${1##*/}+=~+'.'+%7C%7C+${2##*/}+=~+'.'+]];+then
++++[+${1##*.}+!=+${2##*.}+]+&&+echo+"Error:+Files+must+have+same+extension."+&&+return+1
+++++ext=.${1##*.}
++fi
++touch+tmp$ext+#+use+empty+file+as+the+'root'+of+the+merge
++cp+$1+backup$ext
++git+merge-file+$1+tmp$ext+$2+#+will+write+to+file+1
++mv+$1+merge$ext
++mv+backup$ext+$1
++rm+tmp$ext
++echo+"Files+merged+into+\"merge$ext\"."
}|code-block|syntax|javascript|1503020|entityMap^0|13|7|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@$9|N|A|O|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|P|8|@]|D|@]|E|$I|J]]|$1|K|3|-4|5|6|7|Q|8|@]|D|@]|E|$]]]|L|$]]

Just to add on to manojlds's answer, here's a nice, complete function you can add to your <code>.bashrc</code> that does the job. It has the benefit of properly identifying your two files' names in the "merge conflict" blocks.

<pre class="lang-sh prettyprint-override"><code>merge() {
 local ext
 [ $# -ne 2 ] &amp;&amp; echo "Error: Need exactly two args." &amp;&amp; return 1
 [[ ! -r $1 || ! -r $2 ]] &amp;&amp; echo "Error: One of the files is not readable." &amp;&amp; return 1
 if [[ ${1##*/} =~ '.' || ${2##*/} =~ '.' ]]; then
 [ ${1##*.} != ${2##*.} ] &amp;&amp; echo "Error: Files must have same extension." &amp;&amp; return 1
 ext=.${1##*.}
 fi
 touch tmp$ext # use empty file as the 'root' of the merge
 cp $1 backup$ext
 git merge-file $1 tmp$ext $2 # will write to file 1
 mv $1 merge$ext
 mv backup$ext $1
 rm tmp$ext
 echo "Files merged into \"merge$ext\"."
}
</code></pre>

blocks|key|509042|text|您也可以使用KDiff3来实现这一点。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|509043|509044|选择文件一个|unordered-list-item|509045|选择文件两个|509046|509047|和合并:)|509048|http://kdiff3.sourceforge.net/|offset|length|509049|entityMap|0|LINK|mutability|MUTABLE|url^0|0|0|0|0|0|0|0|U|0|0^^$0|@$1|2|3|4|5|6|7|V|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|W|8|@]|9|@]|A|$]]|$1|C|3|D|5|E|7|X|8|@]|9|@]|A|$]]|$1|F|3|G|5|E|7|Y|8|@]|9|@]|A|$]]|$1|H|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]|$1|I|3|J|5|6|7|10|8|@]|9|@]|A|$]]|$1|K|3|L|5|6|7|11|8|@]|9|@$M|12|N|13|1|14]]|A|$]]|$1|O|3|-4|5|6|7|15|8|@]|9|@]|A|$]]]|P|$Q|$5|R|S|T|A|$U|L]]]]

You can also use KDiff3 for this.

<ul>
<li>Select file one</li>
<li>Select file two</li>
</ul>

And merge :)

<a href="http://kdiff3.sourceforge.net/" rel="nofollow noreferrer">http://kdiff3.sourceforge.net/</a>

I want to take advantage of the git-merge algorithm on two arbitrary files in a git repo. Here is my working directory:

<pre><code>folder/
 file1
 file2
</code></pre>

file1 and file2 are similar, but I want to see how git would merge them as if they were different versions of the same file. In other words, I want something like this:

<pre><code>git merge-files file1 file2 &gt; merge_of_file1_file2
</code></pre>

Is there a way to do this?

run git merge algorithm on two individual files

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

我想在一个git库中的两个任意文件上利用git-merge算法。下面是我的工作目录：folder/    file1    file2file1和file2很相似，但我想看看git如何将它们合并，就像它们是同一文件的不同版本一样。换句话说，我想要这样的东西：git merge-files file1 file2 > m...

问在两个单独的文件上运行git合并算法
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问在两个单独的文件上运行git合并算法EN