CODEWITHSUNDEEP
eclipsegitegit
Geddon
Geddon

Reputation: 1306

EGit Conflicts with every pull

I am new to Git which is different from all the other source control tools I have administered.

In my situation, I have an android project which is on the remote repository and my Friend and I both added this to our eclipse. The project is a couple of days old, where My friend made a couple of changes to a few files and committed and pushed it to the repository.

I on the other hand, didn't make any changes but got conflicts on all the files he changed when I did a egit pull. I did a hard reset and clean to get things back to normal since I didnt make any changes. Then the next day he pushed a few more changes and the same thing happened, conflicts on files he changed.

Is this normal for git? I am kinda scared to proceed with Git knowing that these conflict happen without any changes on the other end. What should I do to resolve this?

Thanks.

Upvotes: 0

Views: 111

Answers (1)

323go
323go

Reputation: 14274

As you're working in both Mac (Linux) and Windows environments, you'll wind up dealing with issues due to different line-endings. You can instruct EGit to not modify line-endings on pull and ignore differences, by adding/modifying core settings. In preferences, navigate to Git settings and add:

[core]
    autocrlf = false
    whitespace = cr-at-eol

Upvotes: 1

Related Questions