Thomas Ackermann wrote:
>> Maybe the intent is
>>
>> Git can help you perform a three-way merge, which can in turn be
[...]
> If you don't mind I will use your text
No problem.
Signed-off-by: Jonathan Nieder
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a
>
> Maybe the intent is
>
> Git can help you perform a three-way merge, which can in turn be
> used for a many-way merge by repeating the merge procedure several
> times. The usual situation is that you only do one three-way merge
> (reconciling two lines of history) and
Thomas Ackermann wrote:
> --- a/Documentation/user-manual.txt
> +++ b/Documentation/user-manual.txt
> @@ -3992,16 +3992,16 @@ Merging multiple trees
>
> Git helps you do a three-way merge, which you can expand to n-way by
> repeating the merge procedure arbitrary times until you finally
> -"co
3 matches
Mail list logo