unexpected T_SL from Caused by Git

I am now making changes directly on my ftp server so I created a remote repository on my ftp server and attempted to push to origin, the same repository I was 开发者_如何转开发pushing to on my local machine.

I got a non-fast forward error, and attempted to do a pull request, I got "warning no common commits" I ended up with this error on my site "unexpected T_SL"

GIT inserted <<

---

The T_SL error is PHP telling it found a <<<<<< conflict marker inserted by Git.

fgrep -R . '<<<<<'

will find all such files.

If you want to keep your local changes, you'll need to resolve those conflicts (either manually or via git mergetool), commit them and pull from that repo.

If you want to get rid of local changes, do git reset --hard or safer, git stash, which will save those changes in a stash (you can get it back with git stash pop).