Re: Resolving GIT Merge conflicts breaks code

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

2021-07-27 Thread Miller, David D
I use BeyondCompare for all merging. It does a really good job of sematic comparison. I integrated it into svn using TortoiseSVN. I think it can be configured to work with git as well. From: Emilian Bold Sent: Tuesday, July 27, 2021 8:58 AM To: Andreas Reichel Cc: NetBeans Mailing Subject: