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 79631

Summary:	Merge partial changes between CVS branches
Product:	versioncontrol	Reporter:	christo <christo>
Component:	CVS	Assignee:	issues@versioncontrol <issues>
Status:	NEW ---
Severity:	blocker
Priority:	P2
Version:	5.x
Hardware:	All
OS:	All
Issue Type:	ENHANCEMENT	Exception Reporter:

Description christo 2006-07-03 16:12:49 UTC

It would be nice to be able to merge changes graphically, simmilar to the 
resolve conflicts gui, between different CVS branches. It happens that I only 
want to merge a few small features or fixes I've made in my development branch 
with the head branch and leave some features as is.

Comment 1 twolf2919 2008-08-14 14:27:31 UTC

Similar scenario here: we have a branch to which some changes were made that shouldn't go in the trunk.  It would be
nice to have a "preview" from which to choose the changes to be merged.