[cvsnt] Re: CVS for Oracle forms.

[Gerhard Fiedler]

Bo Berglund wrote:

> Gerhard Fiedler wrote:
>> For example, Microsoft Word includes a merge facility. Even though MS
>> Word files are binary and stored in cvs as binary files, and thus cvs
>> itself doesn't do any automatic merging on them, it is possible to do
>> the merge manually, using Word's own merge facility when you need to
>> merge branches.
> 
> Interesting, I did not know about MSWord being able to do this. Could
> you just hint on how it is done? I have numerous cVS controlled files
> that are MSWord and it would be valuable to be able to merge different
> versions of the sama file.

Try Tools | Compare and Merge Documents...

It needs a bit getting used to. Basically, you open one file and then use
this command to merge it with another one. You have three options for the
merge target in the Merge button of the file open dialog that comes up.
Word uses its tracking markers to display the merged parts. You then can
review the changes one by one and accept, deny or modify (using the
commands on the tracking toolbar). Or, if the merge seems to have gone
well, you also can accept all of them at once.

Gerhard