Files pull from GitHub contain HEAD >>>>>>>>? [duplicate]

Question

This question already has answers here:

Git merge left HEAD marks in my files (5 answers)

Closed 8 years ago.

I update all my files on my server via GitHub. But yesterday I did a "git pull" but the files that were downloaded were corrupted so when I checked the website they were weird things appearing. It was written HEAD >>>>>>>>>> I don't remember the rest... And some weird token code

What could of caused this?

Is there a way for me to check after a pull if the files are corrupted or not?

I have iptables setup...

Using Linux Ubuntu 12.

Answer 1

HEAD >>>>>>>>>>

looks like a merge marker. Most likely, there was a merge conflict, and you committed the result without resolving the merge.

The easiest way to resolve merge conflicts is to use git mergetool. See http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging