I have branch A and branch B . I am trying to merge from B to A .
I am on branch A
I run
git merge B
Git merges some stuff. I can see some conflicts and merged files, but there is a file in B which is new (no versions of such file in A) and that file is not taken.
I don't have it in A after merge. Any ideas what am I doing wrong ?