TIP: Click on subject to list as thread! ANSI
echo: osdebate
to: Mike `/m`
from: Gregg N
date: 2005-04-22 17:27:22
subject: Re: SCM recomends

From: "Gregg N" 

Mike '/m' wrote:
>> If there are no lexical conflicts (the changes do not
>> affect the same lines) there is no need for manual intervention.
>
> That is a highly optimistic viewpoint.  Too optimistic, IMO.
>
> /m

No optimism is involved here. I only meant that the tool's merge process
does not require manual intervention as long as there are no lexical
conflicts. I then went on to say:

"The only caveat is that lack of lexical conflict does not guarantee
lack of semantic conflict."

In other words there is no guarantee that the end result is correct, but
the automated approach is usually the fastest way to the correct result.

Gregg

--- BBBS/NT v4.01 Flag-5
* Origin: Barktopia BBS Site http://HarborWebs.com:8081 (1:379/45)
SEEN-BY: 633/267 270
@PATH: 379/45 1 106/2000 633/267

SOURCE: echomail via fidonet.ozzmosis.com

Email questions or comments to sysop@ipingthereforeiam.com
All parts of this website painstakingly hand-crafted in the U.S.A.!
IPTIA BBS/MUD/Terminal/Game Server List, © 2025 IPTIA Consulting™.