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.

Bug 129613

Summary:	Support merging of independently added files
Product:	versioncontrol	Reporter:	Tim Lebedkov <lebedkov>
Component:	CVS	Assignee:	issues@versioncontrol <issues>
Status:	NEW ---
Severity:	blocker
Priority:	P3
Version:	6.x
Hardware:	All
OS:	All
Issue Type:	ENHANCEMENT	Exception Reporter:

Description Tim Lebedkov 2008-03-08 23:16:53 UTC

If a file is added by somebody independently it cannot be updated/merged. Instead one have to rename the file, update
it, delete the updated file and merge changes. It would be great if merging would be enabled for this case too.