Jason Thorpe <thorpej@nas.nasa.gov> writes:
> How can it possibly resolve conflicts?

It can't.

> 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".

The differences as to running sup + cvs import is that you maintain
the history from the original repository and you just transfer diffs.
So, it's not `really different' but sure is more convenient.

/assar