Conflict Resolver for Merging branch

Nirvann <[email protected]>
Newsgroups gmane.comp.version-control.cvs.general
Message-ID <[email protected]> 
I am trying to merge two version of same file, one from trunk and other one
from branch using the netbeans conflict resolver. Actually I want code from
both the files to be there in the merged file. How can I do this.

regards,
nirvan.
-- 
View this message in context: http://www.nabble.com/Conflict-Resolver-for-Merging-branch-tp25000889p25000889.html
Sent from the Gnu - Cvs - Info mailing list archive at Nabble.com.
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.