Why did git pull change my code without throwing merge conflicts for all changes?

Question

I commited a new feature locally, pulled from remote and got merge conflicts. After resolving them, my feature stopped working. I assumed that I made an error, so I did a ha