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 243824

Summary:	Cant edit result section during "resolve conflict"
Product:	utilities	Reporter:	dawoyan
Component:	Diff	Assignee:	Ondrej Vrabec <ovrabec>
Status:	NEW ---
Severity:	normal	CC:	chrizzly, markiewb, ulfzibis
Priority:	P3
Version:	8.0
Hardware:	Macintosh
OS:	Mac OS X
Issue Type:	ENHANCEMENT	Exception Reporter:
Attachments:	IDE log

Description dawoyan 2014-04-14 14:19:05 UTC

Hello

I am always having problem resolving git conflicts - I can't all the time accept HEAD or local version of line completely, sometimes I must take part of one side and put it into another part - so the IDE doesn't allow me to edit in place in result section of "resolve conflicts" window.

please if it is possible make Result part editable.

thanks


Product Version = NetBeans IDE 8.0 (Build 201403101706)
Operating System = Mac OS X version 10.8.5 running on x86_64
Java; VM; Vendor = 1.7.0_45
Runtime = Java HotSpot(TM) 64-Bit Server VM 24.45-b08

Comment 1 dawoyan 2014-04-14 14:19:09 UTC

Created attachment 146744 [details]
IDE log

Comment 2 Ondrej Vrabec 2014-08-06 07:04:28 UTC

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

Comment 3 markiewb 2016-01-10 20:03:49 UTC

Related to https://netbeans.org/bugzilla/show_bug.cgi?id=212811

Comment 4 ulfzibis 2016-01-14 22:11:31 UTC

Yes, 3-way is related, but not the same case here.
We only want to have the output pane of the current 2-way diff to be editable.
A 3-way diff is much more:
- it additionally includes the 3rd pane into the diff algorithm.
- usually all three panes are editable.
But it has a negative side effect:
- all 3 panes have to be side by side, so the horizontal space is rather small.

Comment 5 Ondrej Vrabec 2016-11-04 13:15:28 UTC

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