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

Summary:	Merge Conflicts Resolver: Make it possible to pick both changes
Product:	utilities	Reporter:	oysteing <oysteing>
Component:	Diff	Assignee:	diff-issues@utilities <diff-issues>
Status:	RESOLVED DUPLICATE
Severity:	blocker
Priority:	P3
Version:	6.x
Hardware:	Sun
OS:	Solaris
Issue Type:	ENHANCEMENT	Exception Reporter:

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 ***