This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
|Summary:||SVN conflict not allow to keep both version|
|Component:||Subversion||Assignee:||Ondrej Vrabec <ovrabec>|
|Issue Type:||ENHANCEMENT||Exception Reporter:|
Description kerog 2013-04-17 13:18:47 UTC
In svn plugging, I've only 2 options: 1 - I can accept only change from left panel 2 - I can accept only change from right panel eg. In left panel I have: this = '111', this = '222', this = '333' In right panel I have: this = '111', this = '444', this = '555' In result I would like to keep both of changes: this = '111' this = '222' this = '333' this = '444' this = '555' In Tortoise merge client I can do this (I've option: - only mine - only theirs - first mine then theirs - first theirs then mine), but in netbeans I can't. Could you develop this feature, please? Kind Regards Konrad Gorczyca