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 128168 - Merge Conflicts Resolver: Make it possible to pick both changes
Summary: Merge Conflicts Resolver: Make it possible to pick both changes
Status: RESOLVED DUPLICATE of bug 25501
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: 6.x
Hardware: Sun Solaris
: P3 blocker (vote)
Assignee: diff-issues@utilities
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-02-22 14:27 UTC by oysteing
Modified: 2008-04-08 13:35 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 oysteing 2008-02-22 14:27:37 UTC 
In Merge Conflicts Resolver, I find no way to accept both the local change and the change from the repository.
E.g., I and someone else have both added a line of code at the same position, and I want both lines to be part of the code.
Comment 1 Maros Sandor 2008-04-08 13:35:29 UTC 

*** This issue has been marked as a duplicate of 25501 ***