git pull error

edited September 2014 in Installation
I am trying using git to pull fuelcms for a new project

So i created a new folder in localhost

- git init
- git remote add origin
- git pull

the cms is then pulled, however i noticed there are <<<<<<HEAD append at the top of the file and >>>>token number append at the end of the file

How to remove these extra <<<<<<HEAD


  • edited September 2014
    Those are from a Git merge conflict it looks like. Which file's/URL show this? If you do a search for that string in your project, what file(s) comes up?
  • edited 4:40AM
  • edited 4:40AM
    The main bootstrap index.php file is where you are seeing those <<<<<<HEAD? If so, have you made changes to that file? If so, you may need to manually merge any changes you made with the FUEL index.php version.
  • edited 4:40AM
    Yes, in fact i used git clone to solve the isuue thanks
Sign In or Register to comment.