i tried to play with github's forking, so i forked AndEngine project. Now when i do:
git clone https://github.com/Apoptyzm/AndEngine.git
git pull origin master
I get tons of auto-merged conflicts and conflicts like:
CONFLICT: FontFactory.java deleted in HEAD and modified in {HASH}. Version {HASH} of FontFactory.java left in tree.
So my question is why am i downloading different files from my repo on default?