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 <emilian.b...@gmail.com> Sent: Tuesday, July 27, 2021 8:58 AM To: Andreas Reichel <andr...@manticore-projects.com> Cc: NetBeans Mailing <users@netbeans.apache.org> Subject: 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 improvement since forever and I think I recently saw a post about a command line tool that does semantic level diff. I wonder if that can be configured with the IDE. Funny thing is the IDE has an AST for both files and could do the job better. 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 ;-) --emi mar., 27 iul. 2021, 04:18 Andreas Reichel <andr...@manticore-projects.com<mailto:andr...@manticore-projects.com>> a scris: 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 obstacles: 1) the difference is determined only by line numbers, but not by logical code blocks, e. g. methods or if/else statements. If you are unlucky, the conflict tears your code block apart and you end up with invalid code after Resolve Conflict. You can see that line 359 of the Merge Result, where the closing Curly Bracket is missing. This is especially annoying for super simple and obvious "conflicts" like shown below, when the solution was to just add all the new methods. 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 finding the files in the Source tree. Is there any chance to smoothing these rough edges please? Whom would I need to bribe? Thank you all in advance and best regards Andreas [cid:a14760ca12a60a939b9c05e1d97736174743974a.camel@manticore-projects.com-0]
