git-merge-tree 命令

常用示例

说明

git merge-tree performs a three-way merge without touching the index or working tree. It shows what a merge would produce, making it useful for previewing merges or performing scripted merge analysis. The modern mode (default since Git 2.38) automatically finds the merge base, writes a result tree object, and reports conflicts. The exit code indicates success (0) or conflicts (1). This makes it ideal for CI pipelines and automation scripts that need to check mergeability without modifying any files. The deprecated trivial-merge mode requires specifying the base commit explicitly and only handles trivial merges.

参数

--write-tree

Modern mode (default since Git 2.38): automatically finds the merge base and writes a result tree object. Reports conflicts via exit code and stdout.

--trivial-merge

Deprecated mode: reads three trees and outputs trivial merge results. Requires explicit base.

--no-messages

Write informational messages such as "Auto-merging" and CONFLICT notices. Default: included when conflicts exist.

--name-only

In the output, show only filenames instead of full merge details.

--allow-unrelated-histories

Allow merging branches that share no common history.

--merge-base _commit_

Specify a merge base instead of computing one automatically. With this option, branch arguments can be trees instead of commits. Incompatible with --stdin.

--stdin

Read commits to merge from standard input, one pair per line. Implies -z.

-z

Use NUL characters as line terminators instead of newlines (for scripting).