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
Created attachment 146744 [details]
*** Bug 246290 has been marked as a duplicate of this bug. ***
Related to https://netbeans.org/bugzilla/show_bug.cgi?id=212811
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.
*** Bug 268826 has been marked as a duplicate of this bug. ***