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.
