Interactively merging two branches in git, netbeans environment?

Question

git

A couple of months ago, a branch was made from the current version of the project. Changes were made on both branches in parallel and now the question arose of their connection.
When merging revisions, the file often ends up with just two versions of the file, from one branch above, from the other after it. I might as well just copy and paste two different versions into a file myself.
I would like an interactive line-to-line comparison and manual file-by-file matching. Is this possible in netbeans? if not, other methods are certainly acceptable. any method that allows you to do so is acceptable.
Thanks in advance for tips and direction.

Answer 1

Those. there is a conflict that says that the files are completely different and prompts you to choose one of the versions?
Use TortoiseGit instead of netbeans when merging, and if that doesn't help, use p4merge as a conflict resolution tool.