On Mon, Mar 25, 2013 at 1:17 PM, Junio C Hamano wrote:
> Subject: [PATCH] merge-one-file: force content conflict for "both side added"
> case
s/both side/both sides/
> Historically, we tried to be lenient to "both side added, slightly
Ditto.
> differently" case and as long as the files can be
Junio C Hamano writes:
> Actually, this one is even better, I think. Again on top of your
> two patches applied on 'maint'.
Scratch that one. The "if test -z "$1"" block needs to be moved a
bit higher, like this (the log message can stay the same):
diff --git a/git-merge-one-file.sh b/git-mer
Junio C Hamano writes:
> Kevin Bracey writes:
>
>> Commit 718135e improved the merge error reporting for the resolve
>> strategy's merge conflict and permission conflict cases, but led to a
>> malformed "ERROR: in myfile.c" message in the case of a file added
>> differently.
>>
>> This commit r
Kevin Bracey writes:
> Commit 718135e improved the merge error reporting for the resolve
> strategy's merge conflict and permission conflict cases, but led to a
> malformed "ERROR: in myfile.c" message in the case of a file added
> differently.
>
> This commit reverts that change, and uses an al
Commit 718135e improved the merge error reporting for the resolve
strategy's merge conflict and permission conflict cases, but led to a
malformed "ERROR: in myfile.c" message in the case of a file added
differently.
This commit reverts that change, and uses an alternative approach without
this fl
Commit 718135e improved the merge error reporting for the resolve
strategy's merge conflict and permission conflict cases, but led to a
malformed "ERROR: in myfile.c" message in the case of a file added
differently.
This commit reverts that change, and uses an alternative approach without
this fl
6 matches
Mail list logo
