GIT: Problems with conflicts when there is white space

Asked

Viewed 262 times

1

I don’t know what’s going on with the repository I’m using, but all the programmers who are using it are contemplating the same conflicts after the pull.

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

Example:

public function get(){

    <<< HEAD


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

    $test = 1;
    return $test;
  }

How can I fix this?

git
  • 1

    This is looking like file corruption. And of course it was spreading to everyone.

  • Keep giving chmod -R 0777 * in the repository clone folder can cause this problem? (since it seems to count as a change, according to how rabbitvcs?

  • Can’t it be those commands from java -jre bfg and git filter-branch who’s giving these sticks away?

1 answer

1


When giving a git merge, you can ignore checks on whitespace using the following parameter:

git merge -Xignore-all-space

or

git merge -Xignore-space-change

Browser other questions tagged git

You are not signed in. Login or sign up in order to post.