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 141198

Summary:	Merge Conflicts Resolver should have ability to use changes from both version
Product:	utilities	Reporter:	sjh <sjh>
Component:	Diff	Assignee:	Ondrej Vrabec <ovrabec>
Status:	REOPENED ---
Severity:	blocker	CC:	fortruth, nony
Priority:	P1
Version:	8.2
Hardware:	PC
OS:	Windows 10
Issue Type:	ENHANCEMENT	Exception Reporter:

Description sjh 2008-07-22 16:56:08 UTC

The Merge conflicts resolver, allows one to choose the changes in one file or the other.  There are many times that
changes have been made on the same line in each file, but are unrelated and thus we need both changes.  Just as a
suggestion, the Cervesia conflict resolver (part of KDevelop), does this by adding two options of "A+B" and "B+A".

It would also be nice to be able to directly edit the merged result in the resolver too.

Comment 1 Peter Pis 2008-10-23 12:41:43 UTC

Reassigning to diff. It's a general issue for all VCSs supported by the IDE.

Comment 2 markiewb 2013-05-01 19:58:51 UTC

*** Bug 208431 has been marked as a duplicate of this bug. ***

Comment 3 Ondrej Vrabec 2013-09-03 15:09:47 UTC

fix: http://hg.netbeans.org/core-main/rev/e7538c187920

Comment 4 tekercibasi 2015-02-19 11:09:05 UTC

sjh mentioned a good point I know from beyond compare, too, but miss in netbeans. I'm not quite sure if there is any possibility to "activate" the ability to directly edit the "Result after merge" tab.

sjh:
"It would also be nice to be able to directly edit the merged result in the resolver too."

Comment 5 Ondrej Vrabec 2015-02-19 11:46:00 UTC

(In reply to tekercibasi from comment #4)
> sjh:
> "It would also be nice to be able to directly edit the merged result in the
> resolver too."
That would be this: https://netbeans.org/bugzilla/show_bug.cgi?id=212811

Comment 6 markiewb 2016-01-10 20:01:56 UTC

*** Bug 25501 has been marked as a duplicate of this bug. ***

Comment 7 I_B 2018-11-18 13:35:11 UTC

Bug is still not fixed. It is really hard to resolve conflicts when final file can't be edited.