Horton

Re: SCMS question

Markus Wanner <markus@bluegap.ch>

View thread View on postgr.es
From: Markus Schiltknecht <markus@bluegap.ch>
To: Tom Lane <tgl@sss.pgh.pa.us>
Cc: Alvaro Herrera <alvherre@commandprompt.com>, Bruce Momjian <bruce@momjian.us>, Gregory Stark <stark@enterprisedb.com>, Warren Turkal <wt@penguintechs.org>, pgsql-hackers@postgresql.org
Date: 2007-02-26T10:07:01Z
Lists: pgsql-hackers 
Hi,

Tom Lane wrote:
> Yah know, the one bit of these pitches that always sounds like pure
> snake oil is the claim that they offer some kind of mechanical solution
> to merge conflicts.  AFAICS that has nothing to do with the SCMS in use
> and everything to do with whether your "diff" command is AI-complete.

You should have said "merge" command. Every tried that? Or kdiff3? Try 
it, you will be surprised!

Regards

Markus