2

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.

Aziz Shaikh
  • 16,245
  • 11
  • 62
  • 79
karolkpl
  • 2,189
  • 10
  • 39
  • 60
  • that highly depends on type of the conflicts...... – Amit Mar 21 '12 at 09:36
  • Are you looking for something like `svn merge` ([doc](http://svnbook.red-bean.com/en/1.0/re16.html))? – jgsogo Mar 21 '12 at 09:40
  • I have the same issue. Netbeans merge tool has a big defect - it allows to accept only one of the sites to put to the resulting merge. It's weird. – Serge S. Oct 08 '13 at 12:04

1 Answers1

0

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

Lazy Badger
  • 94,711
  • 9
  • 78
  • 110