GIT: Problems with conflicts when there is white space

Navigation
1

I do not know what's happening with the repository I'm using, but all the programmers who are using it are contemplating the same conflicts after pull .

And often these conflicts are caused by simple spaces that are added to or removed from the document.

Example: 

public function get(){

    <<< HEAD


    ========
    3423asdasd023423>>>>>

    $test = 1;
    return $test;
  }

How can I resolve this?

    
asked by anonymous 10.04.2015 / 19:07

1 answer

1

By giving git merge , you can ignore the checks in the blanks using the following parameter: 

git merge -Xignore-all-space

or 

git merge -Xignore-space-change
    
12.04.2015 / 00:31
Insert search bar Google Maps Set anonymous object property name and resources