I was working on a PHP project in PHPStorm, now after pulling a commit of a friend if found lots of <<<<<<< HEAD and >>>>>>> in my code, what are these and who added them?
Asked
Active
Viewed 453 times
-5
AVEbrahimi
- 17,993
- 23
- 107
- 210
1 Answers
9
These symbols delimit a conflict in an merge performed on this file. You have to resolve the conflict, then create a new commit.
There is plenty of resources to learn how to resolve git conflicts. For example, https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/ from GitHub is a good starting point.
Antwane
- 20,760
- 7
- 51
- 84
-
1PHPStorm has a better tool for resolve git conflict than commandline tool – miltone Dec 28 '15 at 15:21