[cvsnt] Merging Problem

[Gerhard Fiedler]

Pang Fion wrote:

> Hi, i have faced some problem in merging. i want to merge from the branch to 
> head, but everytime after i merge the final result will same as the branch 
> version.
> 
> For example: i create a MS Word Document (Version 1.1), then i make the 
> changes become
>                   (version 1.2). After that, i create a branch called 
> "Test". i make a changes again to the
>                   MS Word Document and assign it to the "Test" branch 
> (Version 1.1.2.1).
> 
> In the merge dialog start = 1.2 , end=1.1.2.1. After that, i click "OK" and 
> i commit it. The final result came out is 1.1.2.1. Can i know what is the 
> problem?

MS Word documents are either binary or some kind of practically unmergeable
XML. You should start with simple text files, and by reading the cvs and
cvsnt manuals about merging. (Even though cvsnt has a few extra features,
the basic idea is still the same as in standard cvs, and many of the
introductory texts still apply to some degree.)

Gerhard