Git - Change from file to symlink not captured in merge

Question

I am using Github Desktop on macos. In my master and branch A I have the following files (extract):

├── src
│   ├── mct-tools
│   │   ├─