Resolving GIT Merge conflicts breaks code

2021-07-26 Thread Andreas Reichel
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

Netbeans Ant builds ignoring project JDK preference

2021-07-26 Thread Tim Mullé
Hi, I think I’m seeing a bug? In Netbeans 12.4 when building with Ant. It appears that when I build a Netbeans project with Ant it is using the JDK that Netbeans is currently running on rather than what JDK the project properties specify. I found this because of a previous email to the group a