Issues when merging

[Anthony]

Hello, 

We are in the process of migrating from SVN to GITLab. When we were on SVN we used TortoiseSVN, we are now going to be using TortoiseGIT. When trying to merge from a branch to the trunk or a branch to a branch we do not get the same merging tool dialog which actually messes up our merge. We dont see any conflits or anything, it just overwrites everything. I am confused!