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 - Cant edit result section during "resolve conflict"
Summary: Cant edit result section during "resolve conflict"
Status: NEW
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: 8.0
Hardware: Macintosh Mac OS X
: P3 normal with 6 votes (vote)
Assignee: Ondrej Vrabec
: 246290 268826 (view as bug list)
Depends on:
Reported: 2014-04-14 14:19 UTC by dawoyan
Modified: 2016-11-04 13:15 UTC (History)
3 users (show)

See Also:
Exception Reporter:

IDE log (55.09 KB, text/plain)
2014-04-14 14:19 UTC, dawoyan

Note You need to log in before you can comment on or make changes to this bug.
Description dawoyan 2014-04-14 14:19:05 UTC

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.


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