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 61696

Summary:	Better merge-support for CVS (and others)
Product:	obsolete	Reporter:	ieising <ieising>
Component:	vcsgeneric	Assignee:	issues@obsolete <issues>
Status:	NEW ---
Severity:	blocker
Priority:	P3
Version:	5.x
Hardware:	All
OS:	All
Issue Type:	ENHANCEMENT	Exception Reporter:

Description ieising 2005-08-03 07:07:06 UTC

Hi,

I would like to see a feature where I can merge files manually when CVS thinks
there are conflicts and can't do an automatic merge, or that enables me to force
a manual merge because I only want certain changes merged with my working file,
eg to disgard stubs etc.
In essence I think it would be the graphical diff screen with features that
allows me to copy a change from repository -> working or from working -> repository.

Iwan