Conflicts in removed files
Aaron Bentley
aaron at aaronbentley.com
Tue Dec 15 22:14:30 GMT 2009
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Algis Kabaila wrote:
> On Tuesday 15 December 2009 18:35:55 Aaron Bentley wrote:
>> Algis Kabaila wrote:
>>> On Saturday 12 December 2009 16:41:22 Stephen J. Turnbull wrote:
>>>> As pointed out by David and IIRC Stefan, the conflicts are *not*
>>>> spurious.
>>> No, they are not. They are persistent, OK?
>> When we say that conflicts are "spurious", we mean that they are
>> unjustified or ill-founded. "persistent" isn't the opposite of
>> spurious. The opposite of spurious is "real" or "valid".
>>
> The "persistent" was not meant to be opposite of "spurious", just a little
> less emotive.
Sorry, I misread you as disagreeing with Stephen. ("...they are not
['not spurious']" -> "They are spurious")
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAksoCkUACgkQ0F+nu1YWqI1/+wCfavbHM/ePqc1KUTbXezfMSLzr
F+IAnAzHrw/TPZlsppSxNDucjDiuchq3
=7rW9
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list