Jerome Ansia
Reputation: 6884
EGit - pull= failled and no conflicts
When i do Team -> Pull on my project
I have result Failed, then below merge input i have tow modification but none of them is impacting the same file, so there is no conflicts.
Why is this showing as failed? Is this a bug?
Upvotes: 7
Views: 843
Answers (1)
Jerome Ansia
Reputation: 6884
I just did a Team -> Reset.
I choose "Mixed" (head and index) and looks like it's working.
(But i don't know if it's the best way)
Upvotes: 5
Related Questions
- Eclipse EGIT: Current branch not configred for pull
- How to resolve conflicts in EGit
- How do I fix "Cannot pull into a repository with state: MERGING" in EGit?
- EGit: cannot push, cannot pull
- Failed merge in EGit
- EGit Conflicts with every pull
- Eclipse egit Error when trying to fetch or push
- Issue with "git pull"
- EGit not pushing, says it's already up to date
- EGit - fetch, merge, pull troubles