Thread (98 messages) 98 messages, 6 authors, 2022-02-02

Re: [PATCH 2/9] ll-merge: make callers responsible for showing warnings

flat view

From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2021-12-21 23:03:19

On Tue, Dec 21 2021, Elijah Newren wrote:
On Tue, Dec 21, 2021 at 1:21 PM Ævar Arnfjörð Bjarmason
[off-list ref] wrote:
quoted
On Tue, Dec 21 2021, Elijah Newren via GitGitGadget wrote:
quoted
From: Elijah Newren <redacted>
quoted
+     if (status == LL_MERGE_BINARY_CONFLICT)
+             warning("Cannot merge binary files: %s (%s vs. %s)",
+                     "base", "ours", "theirs");
This & other messages in the series have warning/BUG etc. starting with
upper-case.
Yes, but I'm not introducing a new message here; I'm merely moving an
existing one.  It's important to me that readers of this patch be able
to verify that I have made no functional changes in this patch, so
fixing the case should definitely be a different patch from this one.
I kind of think that fixing the case distracts a bit from the point of
the series, and the series is already kind of long, but do you feel
strongly that I should fix the case with a new patch inserted into the
series?
I just missed the bit where it was moved from below in the diff. Sorry
about the noise.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help