I have a git repo and I generally work on it via my mac laptop. I had also cloned the repo on my windows laptop (using git bash
and cygwin
) earlier, everything was fine, but today when I took a git pull
I got several merge conflicts
though I had no local changes in my windows laptop.
I think it may be that the folders in mac use /
(forward slash) and in windows \
(backward slash) but I am not sure.
Can anyone tell me why this happened and how to resolve this?