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:

RE: Do you use NetBeans with SVN or CVS?

2018-03-08 Thread Miller, David D
Our company uses SVN. Killing off support for SVN would be a very bad idea at this time. From: Claus Lüthje [mailto:claus.luet...@thetop.ch] Sent: Thursday, March 08, 2018 12:48 PM To: Dawn Raison Cc: users@netbeans.apache.org Subject: Re: Do you use NetBeans with SVN or CVS? Absolutely. Am 0