Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
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?
The HEAD branch of the original repo is
GLES2, meaning that it’s the one checked out after the clone. It must be quite different frommasterbranch, that’s why you get conflicts when pulling from it.Pull on
GLES2instead and you should be fine, or checkoutmaster, depends on what branch you want to code with.