Haha, did I mention there's also an unmerged patch from me *in Bugzilla*
(ie. since forever) providing a proper 3-way merge GUI to NetBeans?
I just use the command line. It's good enough.
--emi
mie., 28 iul. 2021, 16:39 Andreas Reichel
a scris:
> On Wed, 2021-07-28 at 16:29 +0300, Emilian Bold
On Wed, 2021-07-28 at 16:29 +0300, Emilian Bold wrote:
> For a pretty long time OpenBeans.org (initially CoolBeans) had the
> idea the people may want to fund IDE features that would be
> eventually
> pushed into upstream NetBeans. Such an economy didn't really
> materialise.
Wow, I have never eve
>> As for bribing, sadly there is no longer a fork of NetBeans that could take
>> the funds to do such fixes and push them upstream ;-)
>
> Emilian and Team,
>
> Thank you for your feedback.
> How am I supposed to read that:
>
> a) there is already such a Fork (and I just do not know about) or
>
>
On Tue, 27 Jul 2021 at 02:18, Andreas Reichel
wrote:
> 2) I can't edit the Merge result in order to fix any of such issue directly
> (I mean the TextPane "Result after Merge" at the bottom).
> Instead I will need to Resolve all conflicts first and then fix all the
> introduced Code errors findin
On Tue, 2021-07-27 at 15:58 +0300, Emilian Bold wrote:
> As for bribing, sadly there is no longer a fork of NetBeans that
> could take the funds to do such fixes and push them upstream ;-)
Emilian and Team,
Thank you for your feedback.
How am I supposed to read that:
a) there is already such a
: Re: Resolving GIT Merge conflicts breaks code
*External Message* - Use caution before opening links or attachments
Yes, would be nice if that bottom panel was editable.
The underlying problem is the IDE just uses the dumb text based diff which has
no concept about semantics. This is an obvious
Greetings.
Please allow me to ask for help as I continuously struggle with
Resolving GIT Merge conflicts like shown below.
The screenshot shows a Branch A and a Branch B and I would like to
"Accept Both" in order to get Branch A + B. In general this works
somehow but I experience the following obs
