Sourcetree shows me that I change the whole file

[Juan Roberto Porta]

Hello everyone,
Thanks for the help in advance.

I've committed to a branch and that branch then merged with a release branch.
after that I wanted to cherrypick the master branch.
The files that I modified were several and just one that only added 1 line of code. sourcetree shows it to me as a conflict and tells me that it changed the entire file.
The file is "big" it has 2190 lines of java code.
but it has also happened to us with smaller files.
To program we use netbeans 8.2

Please, we would need a solution because it is happening to us often and it becomes tedious to be able to do the merge and we can lose code by mistake.

Thanks,

Regards,

[Christian Graus]

Source tree is using GIT.  So I imagine it's GIT that does this?