SVN Netbeans - Resolve conflicts - keep both versions

Question

I'm using SVN with latest Netbeans. Is it possible to keep both changes when resolving a conflicts? Using netbeans or svn command line?

I have 2 branches, both have file main.java. One developer adds there function funA() in branch 1 and other adds funB() in branch 2. Next I merge both branches to trunk and I get conflict in main.java, but I'd like to save both functions not only one.

Answer 1

Manual merge using mergetools. Which answer you want to see?

More on Merge Conflicts may be useful (and all chapter "Advanced Merging" from first to last chars also). And in case of CLI-merge without mergetools conflicted both parts stored (decorated) in file