Re: a unique merging problem

[Matthew Riechers]

> Gobind Bansal wrote:
> 
> Hello,
> 
> I have two copies of the same text document. I make changes at
> different places in the two copies. Now I need
> to update/integrate/merge the two copies into one.

If one file is in a working directory (A) and the other isn't (B), just
commit A, then copy B over A and commit, Else RTFM

> 
> Can I use cvs for this purpose? I do not mind adding or changing some
> cvs code... but unfortunately I am unaware as yet where to make
> changes.

I don't think your problem is big enough to do something that drastic.
Am I missing something?

> 
> Another hassle is that the text document is in the form of strings and
> not files.

What does that mean?

> 
> Any kind of help is awaited and appreciated
> 
> Thanx
> 
> gobind bansal
> institute of information systems
> eth zurich
> switzerland