Andrew Wong writes:
> ... merge hints in the future as well.
I actually wish we did not have to add any hints in the first place.
> Having one advice config/variable
> for every single situation seems a bit overkill, and we would end up
> with too many variables.
That goes without saying.
--
T
On Wed, Mar 5, 2014 at 1:29 PM, Junio C Hamano wrote:
> If the user said "git merge" while another "git merge" is still
> outstanding, we would want to say "You have not concluded your
> previous merge" and die, and you presumably want to add the same
> "how to abort" message there. Such a codepa
Andrew Wong writes:
> On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder wrote:
>> Andrew Wong wrote:
>>
>>> --- a/builtin/merge.c
>>> +++ b/builtin/merge.c
>>> @@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
>>> + "fix conflicts and then commit the result.\
Andrew Wong writes:
> On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder wrote:
>> Andrew Wong wrote:
>>
>>> --- a/builtin/merge.c
>>> +++ b/builtin/merge.c
>>> @@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
>>> fclose(fp);
>>> rerere(allow_rerere_auto);
>>>
On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder wrote:
> Andrew Wong wrote:
>
>> --- a/builtin/merge.c
>> +++ b/builtin/merge.c
>> @@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
>> fclose(fp);
>> rerere(allow_rerere_auto);
>> printf(_("Automatic merge failed
On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder wrote:
> Seems reasonable, but I worry about the command growing too noisy.
>
> Could this be guarded by an advice. setting? (See advice.*
> in git-config(1) for what I mean.)
Ah, good idea. This seems to belong to advice.resolveConflict. I'll
add
Andrew Wong wrote:
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
> fclose(fp);
> rerere(allow_rerere_auto);
> printf(_("Automatic merge failed; "
> - "fix conflicts and then commit the res
Signed-off-by: Andrew Wong
---
builtin/merge.c | 3 ++-
wt-status.c | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index e576a7f..07af427 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -909,7 +909,8 @@ static int suggest_conflic
8 matches
Mail list logo
