i cloned a git repo and see strange texts in files. HEAD <<< and>>>>>

后端 未结 1 1197
刺人心
刺人心 2021-01-14 06:29

For example i see code

<<<<<<< HEAD
    public function login()
    {
        if($this->_identity===null) {
            $this->_i         


        
相关标签:
1条回答
  • 2021-01-14 07:07

    It's indicating a conflict between different versions.

    If you actually see this in a repository that has been cloned then someone has screwed up, because they have committed something which should have been edited (to choose one of the correct bits of code) when they were resolving a merge conflict.

    0 讨论(0)
提交回复
热议问题