"Conflict discovered" vs "Conflicts discovered"

[Karl Fogel <kf...@red-bean.com>]

Obligatory reference: http://beige.bikeshed.com/

Our new interactive conflict thingy prompts once for each conflicted
file, no matter how many conflicts are in that file.  But the message
(in English) always uses the singular:

   Conflict discovered in 'iota'.
   Select: (p)ostpone, (d)iff, (e)dit, (h)elp :

This fooled me at first, because in programming, we don't usually use
conflict as a mass noun.  A country in a civil war is undergoing
"conflict", to be sure, but when I update my file I get "a conflict"
or "multiple conflicts" :-).  Using the singular implies that there
was exactly one conflict (although note that the plural does not
necessarily imply the opposite).  If Subversion uses the singlular,
then after you resolve the first conflict you see, you might not think
to look further in the file for later conflicts.

So, I suggest we simply add an "s":

   Conflicts discovered in 'iota'.
   Select: (p)ostpone, (d)iff, (e)dit, (h)elp :

That still works for the single-conflict case (note that people often
say "we've got conflicts" even when there's just one conflicting
hunk), and it's much better for the multiple-conflicts case.

Any objections if I make this change?

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: "Conflict discovered" vs "Conflicts discovered"

[Daniel Rall <dl...@finemaltcoding.com>]

--On August 17, 2007 6:14:22 PM -0700 Karl Fogel <kf...@red-bean.com> 
wrote:
...
> So, I suggest we simply add an "s":
>
>    Conflicts discovered in 'iota'.
>    Select: (p)ostpone, (d)iff, (e)dit, (h)elp :
>
> That still works for the single-conflict case (note that people often
> say "we've got conflicts" even when there's just one conflicting
> hunk), and it's much better for the multiple-conflicts case.
>
> Any objections if I make this change?

I'd be partial to either "s", or "(s)", and am in favor of such a change.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org