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 - Better merge-support for CVS (and others)
Summary: Better merge-support for CVS (and others)
Status: NEW
Alias: None
Product: obsolete
Classification: Unclassified
Component: vcsgeneric (show other bugs)
Version: 5.x
Hardware: All All
: P3 blocker (vote)
Assignee: issues@obsolete
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-08-03 07:07 UTC by ieising
Modified: 2005-09-05 09:45 UTC (History)
0 users

See Also:
Issue Type: ENHANCEMENT
Exception Reporter:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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