merge (執行三向文件合并)

rose1 發表于 2020-10-08 05:17

瀏覽次數：

在手機上閱讀

釋放雙眼，帶上耳機，聽聽看~！

00:00

在類似Unix的操作系統上，merge命令執行三向文件合并。合并過程將分析三個文件：一個基本版本和兩個沖突的修改版本。它嘗試基于共享的基本版本將兩組修改自動組合到一個合并的文件中。如果無法進行自動合并，則將有助于手動合并。本文檔介紹了GNU / Linux版本的合并。

查看英文版

1 merge 運行系統環境

2 merge 說明

3 merge的工作方式

4 merge 語法

5 merge 例子

merge 運行系統環境

Linux

merge 說明

merge是RCS版本控制程序包的一部分。它用于執行三向文件合并。

merge分析三個文件-一個原始文件和兩個原始版本的修改版本-并逐行比較它們，以嘗試解決兩組修改之間的差異，以創建一個表示兩個文件的統一文件套變更。

根據兩組更改之間的差異，這可能是自動過程，也可能需要用戶輸入。

如果兩組變更中的任何一組都不沖突，則merge通常可以自行確定要做什么。但是，如果兩組更改發生沖突（例如，如果兩個修改的文件中同一行文字的措詞不同），則merge將在生成的合并文件中顯示沖突。

查看英文版

merge的工作方式

merge將所有從file2到file3的更改合并到file1中。結果通常進入file1。

假設file2是原始文件，而file1和file3都是對file2的修改。然后合并將兩個更改合并在一起。

如果file1和file3在同一行的行中都有更改，則會發生沖突。如果發現沖突，則merge通常會輸出警告，并用“ <<<<<<< ”和“ >>>>>>> ”行將沖突括起來。例如，典型的沖突如下所示：

<<<<<<< file A
lines in file A
=======
lines in file B
>>>>>>> file B

如果存在沖突，則用戶應編輯結果并刪除替代方法之一。

merge incorporates all changes that lead from file2 to file3 into file1. The result ordinarily goes into file1.

Suppose file2 is the original, and both file1 and file3 are modifications of file2. Then merge combines both changes.

A conflict occurs if both file1 and file3 have changes in a common segment of lines. If a conflict is found, merge normally outputs a warning and brackets the conflict with "<<<<<<<" and ">>>>>>>" lines. For instance, a typical conflict will look like this:

<<<<<<< file A
lines in file A
=======
lines in file B
>>>>>>> file B

If there are conflicts, the user should edit the result and delete one of the alternatives.

查看英文版

merge 語法

merge [options] file1 file2 file3

選件

-A	使用diff3（1）的-A樣式（如果diff3支持），則輸出沖突。這會將從file2到file3的所有更改合并到file1中，并生成最詳細的輸出。
-E, -e	這些選項指定產生的信息少于-A的沖突樣式。有關詳細信息，請參見diff3（1）。缺省值為-E。使用-e，merge不會警告沖突。
-L 標簽	該選項最多可給出3次，并指定用于代替沖突報告中相應文件名的標簽。也就是說，merge -L x -L y -L z a b c生成的輸出看起來像是來自文件x，y和z而不是來自文件a，b和c。
-p	將結果發送到標準輸出，而不是覆蓋 file1。
-q	靜音模式。不要警告沖突。
-V	打印RCS的版本號。

merge [options] file1 file2 file3

Options

-A	Output conflicts using the -A style of diff3(1) (if supported by diff3). This merges all changes leading from file2 to file3 into file1, and generates the most verbose output.
-E, -e	These options specify conflict styles that generate less information than -A. See diff3(1) for details. The default is -E. With -e, merge does not warn about conflicts.
-L label	This option may be given up to three times, and specifies labels to be used in place of the corresponding file names in conflict reports. That is, merge -L x -L y -L z a b c generates output that looks like it came from files x, y and z instead of from files a, b and c.
-p	Send results to standard output instead of overwriting file1.
-q	Quiet mode. Do not warn about conflicts.
-V	Print RCS's version number.

查看英文版

merge 例子

假設我們有一個名為orig.txt的文件，其中包含以下內容。

Apples are red.
Oranges are orange.
Blueberries are delicious.

...并命名一個文件mod1.txt，這是修改后的版本orig.txt：

Apples are obviously red.
Oranges are blue.
Blueberries are delicious.

...以及一個名為mod2.txt的文件，該文件也是orig.txt的修改版本：

Apples are obviously red.
Oranges are NOT blue.
Blueberries are delicious.

...然后運行合并，如下所示：

merge mod1.txt orig.txt mod2.txt

它將分析所有三個文件，寫入mod1.txt，并顯示以下警告：

merge: warning: conflicts during merge

這意味著合并成功，但是我們應該意識到存在沖突。如果打開mod1.txt（默認情況下是寫入合并的文件），則會發現它現在包含以下文本：

<<<<<<< mod1.txt
Apples are obviously red.
Oranges are blue.
=======
Apples are obviously red.
Oranges are NOT blue.
>>>>>>> mod2.txt
Blueberries are delicious.

由我們決定保留哪個“ Oranges are ... ”行（或以我們自己的方式組合它們），然后手動對文件進行編輯。

Let's say we have a file named orig.txt with the following contents.

Apples are red.
Oranges are orange.
Blueberries are delicious.

...and a file named mod1.txt, which is a modified version of orig.txt:

Apples are obviously red.
Oranges are blue.
Blueberries are delicious.

...and a file named mod2.txt, which is also a modified version of orig.txt:

Apples are obviously red.
Oranges are NOT blue.
Blueberries are delicious.

...and we run merge as follows:

merge mod1.txt orig.txt mod2.txt

It will analyze all three files, write to mod1.txt, and display the following warning:

merge: warning: conflicts during merge

This means that the merge was successful, but we should be aware that there was a conflict. If we open mod1.txt — which by default is the file where the merge is written — we will find that it now contains the following text:

<<<<<<< mod1.txt
Apples are obviously red.
Oranges are blue.
=======
Apples are obviously red.
Oranges are NOT blue.
>>>>>>> mod2.txt
Blueberries are delicious.

It is up to us to decide which "Oranges are..." line to keep (or to combine them in our own way), and make the edit to the file manually.

查看英文版

其他命令行

如此好文，分享給朋友