Obsolete Terminology

[Aurélien Campéas]

Le 23/08/2012 14:42, Pierre-Yves David a écrit :
> On Sun, Jul 22, 2012 at 08:01:06PM -0400, Greg Ward wrote:
>>> |                     |                          | **conflicting**             |
>
>>> |                     |                          |                             |
>>> |                     |                          | *conflicting* is changeset  |
>>> |                     |                          | that appears when multiple  |
>>> |                     |                          | changesets are successors   |
>>> |                     |                          | of the same precursor.      |
>>
>> Hmmm. I'm torn on this. I completely understand why these two
>> successors are considered "conflicting" (alternately, "in conflict").
>> But the word "conflict" is pretty much taken already: it's what
>> happens when I have to merge two revisions of a file with overlapping
>> changes. You know, back in boring old-fashioned *first* order version
>> control. ;-) I'm leery of using the same word for subtly related but
>> distinct concepts.
>
> Well, what do you think of
>
> - clashing ?  (I like this one)
> - rival ?     (bonus for not ending with "ing")
> - colliding ? (meh, too close to conflicting)
> - discording ?
>

What about:

- usurper ?
- spoofer ?