On 29 Mar 1997 10:35:12 +0200 
 Assar Westerlund <assar@sics.se> wrote:

 > It sure does.  You can have local tags and branches and it will
 > `merge' the RCS files.

I'm glad you put "merge" in quotes...

How can it possibly resolve conflicts?

I can believe it modifies RCS files, doing the right thing on the branch,
but I have a very hard time believing it can merge branch changes into a
modified trunk.

So, in other words, if you have local changes, it _still_ requires human
intervention (unless there's a really hot AI in there), it's still
really no different than sup/"cvs import".

Jason R. Thorpe                                       thorpej@nas.nasa.gov
NASA Ames Research Center                               Home: 408.866.1912
NAS: M/S 258-6                                          Work: 415.604.0935
Moffett Field, CA 94035                                Pager: 415.428.6939